A Swiss Army knife for developers.
C# blazorcross-platformcsharpdesktopdesktop-appdesktop-applicationdeveloper-toolsextensiblefluentfluent-designlinuxmacosmicasyntax-highlightingtypescriptwindowswindows-10windows-11winui
Removed DevToys.Tools
Etienne Baudoux70a4ea14f039
diff --git a/LICENSE.md b/LICENSE.mdindex 48b0929f8..a9a469ec0 100644--- a/LICENSE.md+++ b/LICENSE.md@@ -1,6 +1,6 @@MIT License-Copyright (c) 2021 Etienne Baudoux+Copyright (c) 2021Permission is hereby granted, free of charge, to any person obtaining a copyof this software and associated documentation files (the "Software"), to dealdiff --git a/src/DevToys-Windows.sln b/src/DevToys-Windows.slnindex 339111b9f..480d74423 100644--- a/src/DevToys-Windows.sln+++ b/src/DevToys-Windows.sln@@ -36,15 +36,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "SolutionEndProjectSectionEndProjectProject("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "desktops", "desktops", "{22EE9386-CEFA-47D8-97B2-09A63EDF7F2E}"- ProjectSection(SolutionItems) = preProject- app\dev\platforms\desktop\Directory.Build.props = app\dev\platforms\desktop\Directory.Build.props- app\dev\platforms\desktop\Directory.Build.targets = app\dev\platforms\desktop\Directory.Build.targets- EndProjectSectionEndProjectProject("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevToys.CLI", "app\dev\platforms\desktop\DevToys.CLI\DevToys.CLI.csproj", "{8C72D38A-658D-4C9D-B0AD-2DA975BE7826}"- ProjectSection(ProjectDependencies) = postProject- {B6D48157-5257-4B60-B065-3B231B610A54} = {B6D48157-5257-4B60-B065-3B231B610A54}- EndProjectSectionEndProjectProject("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "_build", "build\_build.csproj", "{745FD4CA-84CC-45D8-A3E2-814A0B9C16C4}"EndProject@@ -52,8 +45,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevToys.Api", "app\dev\DevTEndProjectProject("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevToys.UnitTests", "app\tests\DevToys.UnitTests\DevToys.UnitTests.csproj", "{CCAB7530-4341-4C24-B4E8-28679BB6C4FB}"EndProject-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevToys.Tools", "app\dev\DevToys.Tools\DevToys.Tools.csproj", "{B6D48157-5257-4B60-B065-3B231B610A54}"-EndProjectProject("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevToys.Core", "app\dev\DevToys.Core\DevToys.Core.csproj", "{A730FA8A-3713-4F7A-915D-79098CA12DF0}"EndProjectProject("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevToys.Localization", "app\dev\DevToys.Localization\DevToys.Localization.csproj", "{12A1461D-3357-4007-BE15-9622E9513D09}"@@ -74,9 +65,6 @@ EndProjectProject("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevToys.Blazor", "app\dev\DevToys.Blazor\DevToys.Blazor.csproj", "{565D2497-6078-4558-911C-EA7D3A25AB16}"EndProjectProject("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevToys.Windows", "app\dev\platforms\desktop\DevToys.Windows\DevToys.Windows.csproj", "{48531D2E-83C6-49F2-9ADD-C9490386718B}"- ProjectSection(ProjectDependencies) = postProject- {B6D48157-5257-4B60-B065-3B231B610A54} = {B6D48157-5257-4B60-B065-3B231B610A54}- EndProjectSectionEndProjectGlobalGlobalSection(SolutionConfigurationPlatforms) = preSolution@@ -154,22 +142,6 @@ Global{CCAB7530-4341-4C24-B4E8-28679BB6C4FB}.Release|x64.Build.0 = Release|AnyCPU{CCAB7530-4341-4C24-B4E8-28679BB6C4FB}.Release|x86.ActiveCfg = Release|AnyCPU{CCAB7530-4341-4C24-B4E8-28679BB6C4FB}.Release|x86.Build.0 = Release|AnyCPU- {B6D48157-5257-4B60-B065-3B231B610A54}.Debug|AnyCPU.ActiveCfg = Debug|AnyCPU- {B6D48157-5257-4B60-B065-3B231B610A54}.Debug|AnyCPU.Build.0 = Debug|AnyCPU- {B6D48157-5257-4B60-B065-3B231B610A54}.Debug|ARM64.ActiveCfg = Debug|AnyCPU- {B6D48157-5257-4B60-B065-3B231B610A54}.Debug|ARM64.Build.0 = Debug|AnyCPU- {B6D48157-5257-4B60-B065-3B231B610A54}.Debug|x64.ActiveCfg = Debug|AnyCPU- {B6D48157-5257-4B60-B065-3B231B610A54}.Debug|x64.Build.0 = Debug|AnyCPU- {B6D48157-5257-4B60-B065-3B231B610A54}.Debug|x86.ActiveCfg = Debug|AnyCPU- {B6D48157-5257-4B60-B065-3B231B610A54}.Debug|x86.Build.0 = Debug|AnyCPU- {B6D48157-5257-4B60-B065-3B231B610A54}.Release|AnyCPU.ActiveCfg = Release|AnyCPU- {B6D48157-5257-4B60-B065-3B231B610A54}.Release|AnyCPU.Build.0 = Release|AnyCPU- {B6D48157-5257-4B60-B065-3B231B610A54}.Release|ARM64.ActiveCfg = Release|AnyCPU- {B6D48157-5257-4B60-B065-3B231B610A54}.Release|ARM64.Build.0 = Release|AnyCPU- {B6D48157-5257-4B60-B065-3B231B610A54}.Release|x64.ActiveCfg = Release|AnyCPU- {B6D48157-5257-4B60-B065-3B231B610A54}.Release|x64.Build.0 = Release|AnyCPU- {B6D48157-5257-4B60-B065-3B231B610A54}.Release|x86.ActiveCfg = Release|AnyCPU- {B6D48157-5257-4B60-B065-3B231B610A54}.Release|x86.Build.0 = Release|AnyCPU{A730FA8A-3713-4F7A-915D-79098CA12DF0}.Debug|AnyCPU.ActiveCfg = Debug|AnyCPU{A730FA8A-3713-4F7A-915D-79098CA12DF0}.Debug|AnyCPU.Build.0 = Debug|AnyCPU{A730FA8A-3713-4F7A-915D-79098CA12DF0}.Debug|ARM64.ActiveCfg = Debug|AnyCPU@@ -280,7 +252,6 @@ Global{745FD4CA-84CC-45D8-A3E2-814A0B9C16C4} = {0AC87D9B-BBEC-4DCE-A9D4-82A159E5E7C1}{89A4D88F-5AC0-436A-8EC5-8E98728CA89E} = {B20E4027-0777-4A75-A848-609594E9A6B0}{CCAB7530-4341-4C24-B4E8-28679BB6C4FB} = {4C40BF47-315A-4B60-9ED6-8D65B5E79C2C}- {B6D48157-5257-4B60-B065-3B231B610A54} = {B20E4027-0777-4A75-A848-609594E9A6B0}{A730FA8A-3713-4F7A-915D-79098CA12DF0} = {B20E4027-0777-4A75-A848-609594E9A6B0}{12A1461D-3357-4007-BE15-9622E9513D09} = {B20E4027-0777-4A75-A848-609594E9A6B0}{DB6B033B-584E-43CF-AC96-4F6548C96ECA} = {FA3821C4-74BB-4927-ABCC-0D0A12E097A2}diff --git a/src/Directory.Packages.props b/src/Directory.Packages.propsindex 1f23cb22f..f04d8d27f 100644--- a/src/Directory.Packages.props+++ b/src/Directory.Packages.props@@ -9,17 +9,12 @@<PackageVersion Include="CommunityToolkit.Common" Version="$(CommunityToolkitVersion)" /><PackageVersion Include="CommunityToolkit.Diagnostics" Version="$(CommunityToolkitVersion)" /><PackageVersion Include="CommunityToolkit.Mvvm" Version="$(CommunityToolkitVersion)" />- <PackageVersion Include="CommunityToolkit.Maui" Version="5.2.0" /><PackageVersion Include="coverlet.collector" Version="6.0.0" />- <PackageVersion Include="CronExpressionDescriptor" Version="2.32.0" />- <PackageVersion Include="Cronos" Version="0.8.3" /><PackageVersion Include="FluentAssertions" Version="6.11.0" /><PackageVersion Include="FuzzySharp" Version="2.0.2" /><PackageVersion Include="GirCore.Adw-1" Version="$(GirCore)" /><PackageVersion Include="GirCore.Gtk-4.0" Version="$(GirCore)" /><PackageVersion Include="GirCore.WebKit-6.0" Version="$(GirCore)" />- <PackageVersion Include="Markdig" Version="0.34.0" />- <PackageVersion Include="Markdown.ColorCode" Version="2.1.0" /><PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="$(DotNetVersion)" /><PackageVersion Include="Microsoft.AspNetCore.Components.WebView" Version="$(DotNetVersion)" /><PackageVersion Include="Microsoft.AspNetCore.Components.WebView.Wpf" Version="8.0.3" />@@ -28,8 +23,6 @@<PackageVersion Include="Microsoft.Extensions.Logging" Version="$(DotNetVersion)" Condition="'$(UseMaui)' != 'true'" /><PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="$(DotNetVersion)" Condition="'$(UseMaui)' != 'true'" /><PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="$(DotNetVersion)" Condition="'$(UseMaui)' != 'true'" />- <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.2.0" />- <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.0" /><PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.1.0" /><PackageVersion Include="Microsoft.TypeScript.MSBuild" Version="5.3.2" /><PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.18-beta" />@@ -39,15 +32,10 @@<PackageVersion Include="Nuke.Common" Version="8.0.0" /><PackageVersion Include="OneOf" Version="3.0.263" /><PackageVersion Include="SixLabors.ImageSharp" Version="3.1.3" />- <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="7.2.0" /><PackageVersion Include="System.Text.Json" Version="$(DotNetVersion)" /><PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" /><PackageVersion Include="System.ComponentModel.Composition" Version="$(DotNetVersion)" />- <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" /><PackageVersion Include="xunit" Version="$(XUnit)" /><PackageVersion Include="xunit.runner.visualstudio" Version="$(XUnit)" />- <PackageVersion Include="YamlDotNet" Version="13.7.1" />- <PackageVersion Include="ZXing.Net" Version="0.16.9" />- <PackageVersion Include="ZXing.Net.Bindings.ImageSharp.V3" Version="0.16.15" /></ItemGroup></Project>\ No newline at end of filediff --git a/src/app/dev/DevToys.Api/Core/OneOfExtensions.cs b/src/app/dev/DevToys.Api/Core/OneOfExtensions.csindex aa9e629eb..6d7ba4e6d 100644--- a/src/app/dev/DevToys.Api/Core/OneOfExtensions.cs+++ b/src/app/dev/DevToys.Api/Core/OneOfExtensions.cs@@ -43,6 +43,7 @@ public static class OneOfExtensionsinput.Match(inputFile =>{+ Guard.IsNotNull(fileStorage);if (!fileStorage.FileExists(inputFile.FullName)){return Task.FromResult(new ResultInfo<Stream>(Stream.Null, false));@@ -99,6 +100,7 @@ public static class OneOfExtensionsreturn await input.Match(async inputFile =>{+ Guard.IsNotNull(fileStorage);if (!fileStorage.FileExists(inputFile.FullName)){return new ResultInfo<string>("", false);diff --git a/src/app/dev/DevToys.Api/DevToys.Api.csproj b/src/app/dev/DevToys.Api/DevToys.Api.csprojindex a07194013..baff92574 100644--- a/src/app/dev/DevToys.Api/DevToys.Api.csproj+++ b/src/app/dev/DevToys.Api/DevToys.Api.csproj@@ -25,12 +25,12 @@<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" /><PackageReference Include="OneOf" /><PackageReference Include="System.ComponentModel.Composition" />- <PackageReference Include="System.Threading.Tasks.Extensions" /><PackageReference Include="SixLabors.ImageSharp" /></ItemGroup><ItemGroup><None Include="$(AssemblyName).props" Pack="true" PackagePath="build" />+ <None Include="$(AssemblyName).targets" Pack="true" PackagePath="build" /><None Include="README.md" Pack="true" PackagePath="\" /><None Include="$(RepoRoot)LICENSE.md" Link="LICENSE.md" Pack="true" PackagePath="\" /><None Include="$(RepoRoot)assets\logo\Icon-Windows-Linux.png" Link="Icon-Windows-Linux.png" Pack="true" PackagePath="" />diff --git a/src/app/dev/DevToys.Api/DevToys.Api.targets b/src/app/dev/DevToys.Api/DevToys.Api.targetsnew file mode 100644index 000000000..948217de2--- /dev/null+++ b/src/app/dev/DevToys.Api/DevToys.Api.targets@@ -0,0 +1,31 @@+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">+ <Target Name="RemoveFromCopyLocal" AfterTargets="ResolveAssemblyReferences">+ <!-- Exclude these dlls from appearing in the output (bin) folder when compiling an extension -->+ <ItemGroup>+ <ReferenceCopyLocalPaths+ Remove="@(ReferenceCopyLocalPaths)"+ Condition="$([System.String]::new('%(Filename)').Contains('DevToys.Api'))" />+ <ReferenceCopyLocalPaths+ Remove="@(ReferenceCopyLocalPaths)"+ Condition="'%(Filename)%(Extension)' == 'CommunityToolkit.Common.dll'" />+ <ReferenceCopyLocalPaths+ Remove="@(ReferenceCopyLocalPaths)"+ Condition="'%(Filename)%(Extension)' == 'CommunityToolkit.Diagnostics.dll'" />+ <ReferenceCopyLocalPaths+ Remove="@(ReferenceCopyLocalPaths)"+ Condition="'%(Filename)%(Extension)' == 'Microsoft.Extensions.DependencyInjection.Abstractions.dll'" />+ <ReferenceCopyLocalPaths+ Remove="@(ReferenceCopyLocalPaths)"+ Condition="'%(Filename)%(Extension)' == 'Microsoft.Extensions.Logging.Abstractions.dll'" />+ <ReferenceCopyLocalPaths+ Remove="@(ReferenceCopyLocalPaths)"+ Condition="'%(Filename)%(Extension)' == 'OneOf.dll'" />+ <ReferenceCopyLocalPaths+ Remove="@(ReferenceCopyLocalPaths)"+ Condition="'%(Filename)%(Extension)' == 'SixLabors.ImageSharp.dll'" />+ <ReferenceCopyLocalPaths+ Remove="@(ReferenceCopyLocalPaths)"+ Condition="'%(Filename)%(Extension)' == 'System.ComponentModel.Composition.dll'" />+ </ItemGroup>+ </Target>+</Project>\ No newline at end of filediff --git a/src/app/dev/DevToys.Api/Tool/SmartDetection/PredefinedCommonDataTypeNames.cs b/src/app/dev/DevToys.Api/Tool/SmartDetection/PredefinedCommonDataTypeNames.csindex 298918944..35badb4dc 100644--- a/src/app/dev/DevToys.Api/Tool/SmartDetection/PredefinedCommonDataTypeNames.cs+++ b/src/app/dev/DevToys.Api/Tool/SmartDetection/PredefinedCommonDataTypeNames.cs@@ -20,11 +20,6 @@ public static class PredefinedCommonDataTypeNames/// </summary>public const string JsonArray = "jsonArray";- /// <summary>- /// Represents the YAML data type.- /// </summary>- public const string Yaml = "yaml";-/// <summary>/// Represents the XML data type./// </summary>diff --git a/src/app/dev/DevToys.Tools/SmartDetection/Base64ImageDataTypeDetector.cs b/src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/Base64ImageDataTypeDetector.cssimilarity index 96%rename from src/app/dev/DevToys.Tools/SmartDetection/Base64ImageDataTypeDetector.csrename to src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/Base64ImageDataTypeDetector.csindex c04dda7a1..0c9b73c0e 100644--- a/src/app/dev/DevToys.Tools/SmartDetection/Base64ImageDataTypeDetector.cs+++ b/src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/Base64ImageDataTypeDetector.cs@@ -1,4 +1,4 @@-namespace DevToys.Tools.SmartDetection;+namespace DevToys.Blazor.BuiltInDataTypeDetectors;[Export(typeof(IDataTypeDetector))][DataTypeName(PredefinedCommonDataTypeNames.Base64Image, baseName: PredefinedCommonDataTypeNames.Text)]diff --git a/src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/Base64TextDataTypeDetector.cs b/src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/Base64TextDataTypeDetector.csnew file mode 100644index 000000000..a67c89ccb--- /dev/null+++ b/src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/Base64TextDataTypeDetector.cs@@ -0,0 +1,94 @@+using System.Text;+using System.Text.RegularExpressions;++namespace DevToys.Blazor.BuiltInDataTypeDetectors;++[Export(typeof(IDataTypeDetector))]+[DataTypeName(PredefinedCommonDataTypeNames.Base64Text, baseName: PredefinedCommonDataTypeNames.Text)]+internal sealed partial class Base64TextDataTypeDetector : IDataTypeDetector+{+ public ValueTask<DataDetectionResult> TryDetectDataAsync(object data, DataDetectionResult? resultFromBaseDetector, CancellationToken cancellationToken)+ {+ if (resultFromBaseDetector is not null+ && resultFromBaseDetector.Data is string dataString+ && !long.TryParse(dataString, out _)+ && !string.IsNullOrWhiteSpace(dataString))+ {+ string? trimmedData = dataString.Trim();+ bool isBase64 = IsBase64DataStrict(trimmedData);++ if (isBase64)+ {+ return ValueTask.FromResult(new DataDetectionResult(Success: true, Data: dataString));+ }+ }++ return ValueTask.FromResult(DataDetectionResult.Unsuccessful);+ }++ private static bool IsBase64DataStrict(string? data)+ {+ if (string.IsNullOrWhiteSpace(data))+ {+ return false;+ }++ data = data!.Trim();++ if (data.Length % 4 != 0)+ {+ return false;+ }++ if (Base64Regex().IsMatch(data))+ {+ return false;+ }++ int equalIndex = data.IndexOf('=');+ int length = data.Length;++ if (!(equalIndex == -1 || equalIndex == length - 1 || equalIndex == length - 2 && data[length - 1] == '='))+ {+ return false;+ }++ string? decoded;++ try+ {+ byte[]? decodedData = Convert.FromBase64String(data);+ decoded = Encoding.UTF8.GetString(decodedData);+ }+ catch (Exception)+ {+ return false;+ }++ //check for special chars that you know should not be there+ char current;+ for (int i = 0; i < decoded.Length; i++)+ {+ current = decoded[i];+ if (current == 65533)+ {+ return false;+ }++ if (!(current == 0x9+ || current == 0xA+ || current == 0xD+ || current >= 0x20 && current <= 0xD7FF+ || current >= 0xE000 && current <= 0xFFFD+ || current >= 0x10000 && current <= 0x10FFFF))+ {+ return false;+ }+ }++ return true;+ }++ [GeneratedRegex("[^A-Z0-9+/=]", RegexOptions.IgnoreCase, "en-US")]+ private static partial Regex Base64Regex();+}diff --git a/src/app/dev/DevToys.Tools/SmartDetection/DateDataTypeDetector.cs b/src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/DateDataTypeDetector.cssimilarity index 96%rename from src/app/dev/DevToys.Tools/SmartDetection/DateDataTypeDetector.csrename to src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/DateDataTypeDetector.csindex 6b152c1a2..6d0069f85 100644--- a/src/app/dev/DevToys.Tools/SmartDetection/DateDataTypeDetector.cs+++ b/src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/DateDataTypeDetector.cs@@ -1,4 +1,4 @@-namespace DevToys.Tools.SmartDetection;+namespace DevToys.Blazor.BuiltInDataTypeDetectors;[Export(typeof(IDataTypeDetector))][DataTypeName(PredefinedCommonDataTypeNames.Date, baseName: PredefinedCommonDataTypeNames.Text)]diff --git a/src/app/dev/DevToys.Tools/SmartDetection/FileDataTypeDetector.cs b/src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/FileDataTypeDetector.cssimilarity index 93%rename from src/app/dev/DevToys.Tools/SmartDetection/FileDataTypeDetector.csrename to src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/FileDataTypeDetector.csindex 35445bfc6..afcc84d68 100644--- a/src/app/dev/DevToys.Tools/SmartDetection/FileDataTypeDetector.cs+++ b/src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/FileDataTypeDetector.cs@@ -1,4 +1,4 @@-namespace DevToys.Tools.SmartDetection;+namespace DevToys.Blazor.BuiltInDataTypeDetectors;[Export(typeof(IDataTypeDetector))][DataTypeName(PredefinedCommonDataTypeNames.File, baseName: PredefinedCommonDataTypeNames.Files)]diff --git a/src/app/dev/DevToys.Tools/SmartDetection/FilesDataTypeDetector.cs b/src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/FilesDataTypeDetector.cssimilarity index 91%rename from src/app/dev/DevToys.Tools/SmartDetection/FilesDataTypeDetector.csrename to src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/FilesDataTypeDetector.csindex 84597c069..b02839e34 100644--- a/src/app/dev/DevToys.Tools/SmartDetection/FilesDataTypeDetector.cs+++ b/src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/FilesDataTypeDetector.cs@@ -1,4 +1,4 @@-namespace DevToys.Tools.SmartDetection;+namespace DevToys.Blazor.BuiltInDataTypeDetectors;[Export(typeof(IDataTypeDetector))][DataTypeName(PredefinedCommonDataTypeNames.Files)]diff --git a/src/app/dev/DevToys.Tools/SmartDetection/GZipTextDataTypeDetector.cs b/src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/GZipTextDataTypeDetector.cssimilarity index 74%rename from src/app/dev/DevToys.Tools/SmartDetection/GZipTextDataTypeDetector.csrename to src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/GZipTextDataTypeDetector.csindex 09d06221d..ca155ef83 100644--- a/src/app/dev/DevToys.Tools/SmartDetection/GZipTextDataTypeDetector.cs+++ b/src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/GZipTextDataTypeDetector.cs@@ -1,6 +1,4 @@-using DevToys.Tools.Helpers;--namespace DevToys.Tools.SmartDetection;+namespace DevToys.Blazor.BuiltInDataTypeDetectors;[Export(typeof(IDataTypeDetector))][DataTypeName(PredefinedCommonDataTypeNames.GZip, baseName: PredefinedCommonDataTypeNames.Text)]@@ -13,7 +11,7 @@ internal sealed partial class GZipTextDataTypeDetector : IDataTypeDetector&& !long.TryParse(dataString, out _)&& !string.IsNullOrWhiteSpace(dataString)){- if (GZipHelper.IsGZip(dataString))+ if (IsGZip(dataString)){return ValueTask.FromResult(new DataDetectionResult(Success: true, Data: dataString));}@@ -21,4 +19,11 @@ internal sealed partial class GZipTextDataTypeDetector : IDataTypeDetectorreturn ValueTask.FromResult(DataDetectionResult.Unsuccessful);}++ private static bool IsGZip(string? input)+ {+ ReadOnlySpan<char> trimmedInput = input.AsSpan().TrimStart();++ return trimmedInput is ['H', '4', 's', 'I', ..];+ }}diff --git a/src/app/dev/DevToys.Tools/SmartDetection/ImageDataTypeDetector.cs b/src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/ImageDataTypeDetector.cssimilarity index 92%rename from src/app/dev/DevToys.Tools/SmartDetection/ImageDataTypeDetector.csrename to src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/ImageDataTypeDetector.csindex 4e20a5d09..d7185097a 100644--- a/src/app/dev/DevToys.Tools/SmartDetection/ImageDataTypeDetector.cs+++ b/src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/ImageDataTypeDetector.cs@@ -1,6 +1,6 @@using SixLabors.ImageSharp;-namespace DevToys.Tools.SmartDetection;+namespace DevToys.Blazor.BuiltInDataTypeDetectors;[Export(typeof(IDataTypeDetector))][DataTypeName(PredefinedCommonDataTypeNames.Image)]diff --git a/src/app/dev/DevToys.Tools/SmartDetection/ImageFileDataTypeDetector.cs b/src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/ImageFileDataTypeDetector.cssimilarity index 94%rename from src/app/dev/DevToys.Tools/SmartDetection/ImageFileDataTypeDetector.csrename to src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/ImageFileDataTypeDetector.csindex 7e2b31a0f..841532a27 100644--- a/src/app/dev/DevToys.Tools/SmartDetection/ImageFileDataTypeDetector.cs+++ b/src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/ImageFileDataTypeDetector.cs@@ -1,4 +1,4 @@-namespace DevToys.Tools.SmartDetection;+namespace DevToys.Blazor.BuiltInDataTypeDetectors;[Export(typeof(IDataTypeDetector))][DataTypeName(PredefinedCommonDataTypeNames.ImageFile, baseName: PredefinedCommonDataTypeNames.File)]diff --git a/src/app/dev/DevToys.Tools/SmartDetection/JsonArrayDataTypeDetector.cs b/src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/JsonArrayDataTypeDetector.cssimilarity index 91%rename from src/app/dev/DevToys.Tools/SmartDetection/JsonArrayDataTypeDetector.csrename to src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/JsonArrayDataTypeDetector.csindex 15a3ac8d9..980bebda0 100644--- a/src/app/dev/DevToys.Tools/SmartDetection/JsonArrayDataTypeDetector.cs+++ b/src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/JsonArrayDataTypeDetector.cs@@ -1,7 +1,6 @@-using Microsoft.Extensions.Logging;-using Newtonsoft.Json.Linq;+using Newtonsoft.Json.Linq;-namespace DevToys.Tools.SmartDetection;+namespace DevToys.Blazor.BuiltInDataTypeDetectors;/// <summary>/// Detect non-empty JSON arrays.diff --git a/src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/JsonDataTypeDetector.cs b/src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/JsonDataTypeDetector.csnew file mode 100644index 000000000..d1c47de77--- /dev/null+++ b/src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/JsonDataTypeDetector.cs@@ -0,0 +1,69 @@+using Microsoft.Extensions.Logging;+using Newtonsoft.Json.Linq;+using Newtonsoft.Json;++namespace DevToys.Blazor.BuiltInDataTypeDetectors;++[Export(typeof(IDataTypeDetector))]+[DataTypeName(PredefinedCommonDataTypeNames.Json, baseName: PredefinedCommonDataTypeNames.Text)]+internal sealed partial class JsonDataTypeDetector : IDataTypeDetector+{+ private readonly ILogger _logger;++ [ImportingConstructor]+ public JsonDataTypeDetector()+ {+ _logger = this.Log();+ }++ public async ValueTask<DataDetectionResult> TryDetectDataAsync(+ object data,+ DataDetectionResult? resultFromBaseDetector,+ CancellationToken cancellationToken)+ {+ if (resultFromBaseDetector is not null+ && resultFromBaseDetector.Data is string dataString+ && !long.TryParse(dataString, out _))+ {+ if (await IsValidAsync(dataString, _logger, cancellationToken))+ {+ return new DataDetectionResult(Success: true, Data: dataString);+ }+ }++ return DataDetectionResult.Unsuccessful;+ }++ /// <summary>+ /// Detects whether the given string is a valid JSON or not.+ /// </summary>+ internal static async ValueTask<bool> IsValidAsync(string? input, ILogger logger, CancellationToken cancellationToken)+ {+ if (input == null)+ {+ return true;+ }++ if (long.TryParse(input, out _))+ {+ return false;+ }++ try+ {+ using JsonReader reader = new JsonTextReader(new StringReader(input));+ JToken? jtoken = await JToken.LoadAsync(reader, settings: null, cancellationToken);+ return jtoken is not null;+ }+ catch (JsonReaderException)+ {+ // Exception in parsing json. It likely mean the text isn't a JSON.+ return false;+ }+ catch (Exception ex)+ {+ logger.LogError(ex, "Invalid data detected.");+ return false;+ }+ }+}diff --git a/src/app/dev/DevToys.Tools/SmartDetection/TextDataTypeDetector.cs b/src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/TextDataTypeDetector.cssimilarity index 91%rename from src/app/dev/DevToys.Tools/SmartDetection/TextDataTypeDetector.csrename to src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/TextDataTypeDetector.csindex 84dbdf982..eea209f46 100644--- a/src/app/dev/DevToys.Tools/SmartDetection/TextDataTypeDetector.cs+++ b/src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/TextDataTypeDetector.cs@@ -1,4 +1,4 @@-namespace DevToys.Tools.SmartDetection;+namespace DevToys.Blazor.BuiltInDataTypeDetectors;[Export(typeof(IDataTypeDetector))][DataTypeName(PredefinedCommonDataTypeNames.Text)]diff --git a/src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/XmlDataTypeDetector.cs b/src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/XmlDataTypeDetector.csnew file mode 100644index 000000000..69990667b--- /dev/null+++ b/src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/XmlDataTypeDetector.cs@@ -0,0 +1,101 @@+using System.Xml;+using Microsoft.Extensions.Logging;++namespace DevToys.Blazor.BuiltInDataTypeDetectors;++[Export(typeof(IDataTypeDetector))]+[DataTypeName(PredefinedCommonDataTypeNames.Xml, baseName: PredefinedCommonDataTypeNames.Text)]+internal sealed partial class XmlDataTypeDetector : IDataTypeDetector+{+ private readonly ILogger _logger;++ [ImportingConstructor]+ public XmlDataTypeDetector()+ {+ _logger = this.Log();+ }++ public ValueTask<DataDetectionResult> TryDetectDataAsync(+ object data,+ DataDetectionResult? resultFromBaseDetector,+ CancellationToken cancellationToken)+ {+ if (resultFromBaseDetector is not null+ && resultFromBaseDetector.Data is string dataString)+ {+ if (IsValid(dataString, _logger))+ {+ return ValueTask.FromResult(new DataDetectionResult(Success: true, Data: dataString));+ }+ }++ return ValueTask.FromResult(DataDetectionResult.Unsuccessful);+ }++ /// <summary>+ /// Detects whether the given string is a valid Xml or not.+ /// </summary>+ private static bool IsValid(string? input, ILogger logger)+ {+ if (string.IsNullOrWhiteSpace(input))+ {+ return false;+ }++ if (!ValidateFirstAndLastCharOfXml(input))+ {+ return false;+ }++ try+ {+ var xmlDocument = new XmlDocument();++ // If loading failed, it's not valid Xml.+ xmlDocument.LoadXml(input);++ return true;+ }+ catch (XmlException)+ {+ return false;+ }+ catch (Exception ex)+ {+ logger.LogError(ex, "Invalid data detected.");+ return false;+ }+ }++ /// <summary>+ /// Validate that the XML starts with "<" and ends with ">", ignoring whitespace+ /// </summary>+ private static bool ValidateFirstAndLastCharOfXml(string input)+ {+ for (int i = 0; i < input.Length; ++i)+ {+ if (!char.IsWhiteSpace(input[i]))+ {+ if (input[i] == '<')+ {+ break;+ }+ return false;+ }+ }++ for (int i = input.Length - 1; i >= 0; --i)+ {+ if (!char.IsWhiteSpace(input[i]))+ {+ if (input[i] == '>')+ {+ return true;+ }+ return false;+ }+ }++ return false;+ }+}diff --git a/src/app/dev/DevToys.Tools/SmartDetection/XsdDataTypeDetector.cs b/src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/XsdDataTypeDetector.cssimilarity index 54%rename from src/app/dev/DevToys.Tools/SmartDetection/XsdDataTypeDetector.csrename to src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/XsdDataTypeDetector.csindex a8afd012f..ec060b75e 100644--- a/src/app/dev/DevToys.Tools/SmartDetection/XsdDataTypeDetector.cs+++ b/src/app/dev/DevToys.Blazor/BuiltInDataTypeDetectors/XsdDataTypeDetector.cs@@ -1,7 +1,8 @@-using DevToys.Tools.Helpers;+using System.Xml.Schema;+using System.Xml;using Microsoft.Extensions.Logging;-namespace DevToys.Tools.SmartDetection;+namespace DevToys.Blazor.BuiltInDataTypeDetectors;[Export(typeof(IDataTypeDetector))][DataTypeName(PredefinedCommonDataTypeNames.Xsd, baseName: PredefinedCommonDataTypeNames.Xml)]@@ -23,7 +24,7 @@ internal sealed partial class XsdDataTypeDetector : IDataTypeDetectorif (resultFromBaseDetector is not null&& resultFromBaseDetector.Data is string dataString){- if (XsdHelper.IsValid(dataString, _logger))+ if (IsValid(dataString, _logger)){return ValueTask.FromResult(new DataDetectionResult(Success: true, Data: dataString));}@@ -31,4 +32,26 @@ internal sealed partial class XsdDataTypeDetector : IDataTypeDetectorreturn ValueTask.FromResult(DataDetectionResult.Unsuccessful);}++ /// <summary>+ /// Detects whether the given string is a valid XSD or not.+ /// </summary>+ private static bool IsValid(string? input, ILogger logger)+ {+ try+ {+ using StringReader reader = new(input!);+ var xmlSchema = XmlSchema.Read(reader, null);+ return xmlSchema is not null;+ }+ catch (Exception ex) when (ex is XmlException || ex is XmlSchemaException)+ {+ return false;+ }+ catch (Exception ex)+ {+ logger.LogError(ex, "Invalid data detected.");+ return false;+ }+ }}diff --git a/src/app/dev/DevToys.Tools/Tools/Converters/ConvertersGroup.cs b/src/app/dev/DevToys.Blazor/BuiltInGroups/ConvertersGroup.cssimilarity index 62%rename from src/app/dev/DevToys.Tools/Tools/Converters/ConvertersGroup.csrename to src/app/dev/DevToys.Blazor/BuiltInGroups/ConvertersGroup.csindex d14fa7ed5..cbdb05818 100644--- a/src/app/dev/DevToys.Tools/Tools/Converters/ConvertersGroup.cs+++ b/src/app/dev/DevToys.Blazor/BuiltInGroups/ConvertersGroup.cs@@ -1,4 +1,4 @@-namespace DevToys.Tools.Tools.Converters;+namespace DevToys.Blazor.BuiltInGroups;[Export(typeof(GuiToolGroup))][Name(PredefinedCommonToolGroupNames.Converters)]@@ -9,7 +9,7 @@ internal class ConvertersGroup : GuiToolGroup{IconFontName = "DevToys-Tools-Icons";IconGlyph = '\u0103';- DisplayTitle = Converters.DisplayTitle;- AccessibleName = Converters.AccessibleName;+ DisplayTitle = Groups.ConvertersGroupDisplayTitle;+ AccessibleName = Groups.ConvertersGroupAccessibleName;}}diff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/EncodersDecodersGroup.cs b/src/app/dev/DevToys.Blazor/BuiltInGroups/EncodersDecodersGroup.cssimilarity index 63%rename from src/app/dev/DevToys.Tools/Tools/EncodersDecoders/EncodersDecodersGroup.csrename to src/app/dev/DevToys.Blazor/BuiltInGroups/EncodersDecodersGroup.csindex 569308f84..0893ffe12 100644--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/EncodersDecodersGroup.cs+++ b/src/app/dev/DevToys.Blazor/BuiltInGroups/EncodersDecodersGroup.cs@@ -1,4 +1,4 @@-namespace DevToys.Tools.Tools.EncodersDecoders;+namespace DevToys.Blazor.BuiltInGroups;[Export(typeof(GuiToolGroup))][Name(PredefinedCommonToolGroupNames.EncodersDecoders)]@@ -9,7 +9,7 @@ internal sealed class EncodersDecodersGroup : GuiToolGroup{IconFontName = "DevToys-Tools-Icons";IconGlyph = '\u0105';- DisplayTitle = EncodersDecoders.DisplayTitle;- AccessibleName = EncodersDecoders.AccessibleName;+ DisplayTitle = Groups.EncodersDecodersGroupDisplayTitle;+ AccessibleName = Groups.EncodersDecodersGroupAccessibleName;}}diff --git a/src/app/dev/DevToys.Tools/Tools/Formatters/FormattersGroup.cs b/src/app/dev/DevToys.Blazor/BuiltInGroups/FormattersGroup.cssimilarity index 62%rename from src/app/dev/DevToys.Tools/Tools/Formatters/FormattersGroup.csrename to src/app/dev/DevToys.Blazor/BuiltInGroups/FormattersGroup.csindex ed40fa2e6..95b5f4cec 100644--- a/src/app/dev/DevToys.Tools/Tools/Formatters/FormattersGroup.cs+++ b/src/app/dev/DevToys.Blazor/BuiltInGroups/FormattersGroup.cs@@ -1,4 +1,4 @@-namespace DevToys.Tools.Tools.Formatters;+namespace DevToys.Blazor.BuiltInGroups;[Export(typeof(GuiToolGroup))][Name(PredefinedCommonToolGroupNames.Formatters)]@@ -9,7 +9,7 @@ internal class FormattersGroup : GuiToolGroup{IconFontName = "DevToys-Tools-Icons";IconGlyph = '\u0123';- DisplayTitle = Formatters.DisplayTitle;- AccessibleName = Formatters.AccessibleName;+ DisplayTitle = Groups.FormattersGroupDisplayTitle;+ AccessibleName = Groups.FormattersGroupAccessibleName;}}diff --git a/src/app/dev/DevToys.Tools/Tools/Generators/GeneratorsGroup.cs b/src/app/dev/DevToys.Blazor/BuiltInGroups/GeneratorsGroup.cssimilarity index 63%rename from src/app/dev/DevToys.Tools/Tools/Generators/GeneratorsGroup.csrename to src/app/dev/DevToys.Blazor/BuiltInGroups/GeneratorsGroup.csindex 868985482..6de974045 100644--- a/src/app/dev/DevToys.Tools/Tools/Generators/GeneratorsGroup.cs+++ b/src/app/dev/DevToys.Blazor/BuiltInGroups/GeneratorsGroup.cs@@ -1,4 +1,4 @@-namespace DevToys.Tools.Tools.Generators;+namespace DevToys.Blazor.BuiltInGroups;[Export(typeof(GuiToolGroup))][Name(PredefinedCommonToolGroupNames.Generators)]@@ -9,7 +9,7 @@ internal sealed class GeneratorsGroup : GuiToolGroup{IconFontName = "DevToys-Tools-Icons";IconGlyph = '\u0126';- DisplayTitle = Generators.DisplayTitle;- AccessibleName = Generators.AccessibleName;+ DisplayTitle = Groups.GeneratorsGroupDisplayTitle;+ AccessibleName = Groups.GeneratorsGroupAccessibleName;}}diff --git a/src/app/dev/DevToys.Tools/Tools/Graphic/GraphicGroup.cs b/src/app/dev/DevToys.Blazor/BuiltInGroups/GraphicGroup.cssimilarity index 63%rename from src/app/dev/DevToys.Tools/Tools/Graphic/GraphicGroup.csrename to src/app/dev/DevToys.Blazor/BuiltInGroups/GraphicGroup.csindex 67d8a78cc..d618f08bf 100644--- a/src/app/dev/DevToys.Tools/Tools/Graphic/GraphicGroup.cs+++ b/src/app/dev/DevToys.Blazor/BuiltInGroups/GraphicGroup.cs@@ -1,4 +1,4 @@-namespace DevToys.Tools.Tools.Graphic;+namespace DevToys.Blazor.BuiltInGroups;[Export(typeof(GuiToolGroup))][Name(PredefinedCommonToolGroupNames.Graphic)]@@ -9,7 +9,7 @@ internal sealed class GraphicGroup : GuiToolGroup{IconFontName = "DevToys-Tools-Icons";IconGlyph = '\u0129';- DisplayTitle = Graphic.DisplayTitle;- AccessibleName = Graphic.AccessibleName;+ DisplayTitle = Groups.GraphicGroupDisplayTitle;+ AccessibleName = Groups.GraphicGroupAccessibleName;}}diff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Html/HtmlEncoderDecoder.Designer.cs b/src/app/dev/DevToys.Blazor/BuiltInGroups/Groups.Designer.cssimilarity index 52%rename from src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Html/HtmlEncoderDecoder.Designer.csrename to src/app/dev/DevToys.Blazor/BuiltInGroups/Groups.Designer.csindex 0185e2593..c2c76b3ce 100644--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Html/HtmlEncoderDecoder.Designer.cs+++ b/src/app/dev/DevToys.Blazor/BuiltInGroups/Groups.Designer.cs@@ -8,7 +8,7 @@// </auto-generated>//-------------------------------------------------------------------------------namespace DevToys.Tools.Tools.EncodersDecoders.Html {+namespace DevToys.Blazor.BuiltInGroups {using System;@@ -22,14 +22,14 @@ namespace DevToys.Tools.Tools.EncodersDecoders.Html {[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")][global::System.Diagnostics.DebuggerNonUserCodeAttribute()][global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]- internal class HtmlEncoderDecoder {+ internal class Groups {private static global::System.Resources.ResourceManager resourceMan;private static global::System.Globalization.CultureInfo resourceCulture;[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]- internal HtmlEncoderDecoder() {+ internal Groups() {}/// <summary>@@ -39,7 +39,7 @@ namespace DevToys.Tools.Tools.EncodersDecoders.Html {internal static global::System.Resources.ResourceManager ResourceManager {get {if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Tools.Tools.EncodersDecoders.Html.HtmlEncoderDecoder", typeof(HtmlEncoderDecoder).Assembly);+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Blazor.BuiltInGroups.Groups", typeof(Groups).Assembly);resourceMan = temp;}return resourceMan;@@ -61,119 +61,128 @@ namespace DevToys.Tools.Tools.EncodersDecoders.Html {}/// <summary>- /// Looks up a localized string similar to HTML Encoder and Decoder tool.+ /// Looks up a localized string similar to Converters./// </summary>- internal static string AccessibleName {+ internal static string ConvertersGroupAccessibleName {get {- return ResourceManager.GetString("AccessibleName", resourceCulture);+ return ResourceManager.GetString("ConvertersGroupAccessibleName", resourceCulture);}}/// <summary>- /// Looks up a localized string similar to Configuration.+ /// Looks up a localized string similar to Converters./// </summary>- internal static string ConfigurationTitle {+ internal static string ConvertersGroupDisplayTitle {get {- return ResourceManager.GetString("ConfigurationTitle", resourceCulture);+ return ResourceManager.GetString("ConvertersGroupDisplayTitle", resourceCulture);}}/// <summary>- /// Looks up a localized string similar to Decode.+ /// Looks up a localized string similar to Encoders and decoders./// </summary>- internal static string ConversionDecode {+ internal static string EncodersDecodersGroupAccessibleName {get {- return ResourceManager.GetString("ConversionDecode", resourceCulture);+ return ResourceManager.GetString("EncodersDecodersGroupAccessibleName", resourceCulture);}}/// <summary>- /// Looks up a localized string similar to Select which conversion mode you want to use.+ /// Looks up a localized string similar to Encoders / Decoders./// </summary>- internal static string ConversionDescription {+ internal static string EncodersDecodersGroupDisplayTitle {get {- return ResourceManager.GetString("ConversionDescription", resourceCulture);+ return ResourceManager.GetString("EncodersDecodersGroupDisplayTitle", resourceCulture);}}/// <summary>- /// Looks up a localized string similar to Encode.+ /// Looks up a localized string similar to Formatters./// </summary>- internal static string ConversionEncode {+ internal static string FormattersGroupAccessibleName {get {- return ResourceManager.GetString("ConversionEncode", resourceCulture);+ return ResourceManager.GetString("FormattersGroupAccessibleName", resourceCulture);}}/// <summary>- /// Looks up a localized string similar to Whether to encode or decode HTML.+ /// Looks up a localized string similar to Formatters./// </summary>- internal static string ConversionOptionDescription {+ internal static string FormattersGroupDisplayTitle {get {- return ResourceManager.GetString("ConversionOptionDescription", resourceCulture);+ return ResourceManager.GetString("FormattersGroupDisplayTitle", resourceCulture);}}/// <summary>- /// Looks up a localized string similar to Conversion.+ /// Looks up a localized string similar to Generators./// </summary>- internal static string ConversionTitle {+ internal static string GeneratorsGroupAccessibleName {get {- return ResourceManager.GetString("ConversionTitle", resourceCulture);+ return ResourceManager.GetString("GeneratorsGroupAccessibleName", resourceCulture);}}/// <summary>- /// Looks up a localized string similar to Encode and decode HTML text data.+ /// Looks up a localized string similar to Generators./// </summary>- internal static string Description {+ internal static string GeneratorsGroupDisplayTitle {get {- return ResourceManager.GetString("Description", resourceCulture);+ return ResourceManager.GetString("GeneratorsGroupDisplayTitle", resourceCulture);}}/// <summary>- /// Looks up a localized string similar to Text to encode or HTML to decode.+ /// Looks up a localized string similar to Graphic./// </summary>- internal static string InputOptionDescription {+ internal static string GraphicGroupAccessibleName {get {- return ResourceManager.GetString("InputOptionDescription", resourceCulture);+ return ResourceManager.GetString("GraphicGroupAccessibleName", resourceCulture);}}/// <summary>- /// Looks up a localized string similar to Input.+ /// Looks up a localized string similar to Graphic./// </summary>- internal static string InputTitle {+ internal static string GraphicGroupDisplayTitle {get {- return ResourceManager.GetString("InputTitle", resourceCulture);+ return ResourceManager.GetString("GraphicGroupDisplayTitle", resourceCulture);}}/// <summary>- /// Looks up a localized string similar to HTML Text Encoder / Decoder.+ /// Looks up a localized string similar to Testers./// </summary>- internal static string LongDisplayTitle {+ internal static string TestersGroupAccessibleName {get {- return ResourceManager.GetString("LongDisplayTitle", resourceCulture);+ return ResourceManager.GetString("TestersGroupAccessibleName", resourceCulture);}}/// <summary>- /// Looks up a localized string similar to Output.+ /// Looks up a localized string similar to Testers./// </summary>- internal static string OutputTitle {+ internal static string TestersGroupDisplayTitle {get {- return ResourceManager.GetString("OutputTitle", resourceCulture);+ return ResourceManager.GetString("TestersGroupDisplayTitle", resourceCulture);}}/// <summary>- /// Looks up a localized string similar to HTML.+ /// Looks up a localized string similar to Text./// </summary>- internal static string ShortDisplayTitle {+ internal static string TextGroupAccessibleName {get {- return ResourceManager.GetString("ShortDisplayTitle", resourceCulture);+ return ResourceManager.GetString("TextGroupAccessibleName", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Text.+ /// </summary>+ internal static string TextGroupDisplayTitle {+ get {+ return ResourceManager.GetString("TextGroupDisplayTitle", resourceCulture);}}}diff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/QRCode/QRCodeEncoderDecoder.resx b/src/app/dev/DevToys.Blazor/BuiltInGroups/Groups.resxsimilarity index 81%rename from src/app/dev/DevToys.Tools/Tools/EncodersDecoders/QRCode/QRCodeEncoderDecoder.resxrename to src/app/dev/DevToys.Blazor/BuiltInGroups/Groups.resxindex 0d7047233..2ad284184 100644--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/QRCode/QRCodeEncoderDecoder.resx+++ b/src/app/dev/DevToys.Blazor/BuiltInGroups/Groups.resx@@ -117,38 +117,46 @@<resheader name="writer"><value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value></resheader>- <data name="AccessibleName" xml:space="preserve">- <value>QR Code Encoder and Decoder tool</value>+ <data name="ConvertersGroupAccessibleName" xml:space="preserve">+ <value>Converters</value></data>- <data name="Description" xml:space="preserve">- <value>Read or generate a QR Code from a text. Can be exported as SVG.</value>+ <data name="ConvertersGroupDisplayTitle" xml:space="preserve">+ <value>Converters</value></data>- <data name="ExportAsSvgButtonTitle" xml:space="preserve">- <value>Export as SVG</value>+ <data name="EncodersDecodersGroupAccessibleName" xml:space="preserve">+ <value>Encoders and decoders</value></data>- <data name="ImageWithQrCode" xml:space="preserve">- <value>QR Code</value>+ <data name="EncodersDecodersGroupDisplayTitle" xml:space="preserve">+ <value>Encoders / Decoders</value></data>- <data name="InputOptionDescription" xml:space="preserve">- <value>Image file path containing a QR Code to decode / text file path containing the text to convert to a QR Code</value>+ <data name="FormattersGroupAccessibleName" xml:space="preserve">+ <value>Formatters</value></data>- <data name="InputText" xml:space="preserve">- <value>Text</value>+ <data name="FormattersGroupDisplayTitle" xml:space="preserve">+ <value>Formatters</value>+ </data>+ <data name="GeneratorsGroupAccessibleName" xml:space="preserve">+ <value>Generators</value>+ </data>+ <data name="GeneratorsGroupDisplayTitle" xml:space="preserve">+ <value>Generators</value></data>- <data name="LongDisplayTitle" xml:space="preserve">- <value>QR Code Encoder / Decoder</value>+ <data name="GraphicGroupAccessibleName" xml:space="preserve">+ <value>Graphic</value></data>- <data name="NoQrCodeFound" xml:space="preserve">- <value>No QR Code found in this image</value>+ <data name="GraphicGroupDisplayTitle" xml:space="preserve">+ <value>Graphic</value></data>- <data name="OutputFileOptionDescription" xml:space="preserve">- <value>Path to the output file</value>+ <data name="TestersGroupAccessibleName" xml:space="preserve">+ <value>Testers</value></data>- <data name="SearchKeywords" xml:space="preserve">- <value>QRCode URL</value>- <comment>Alternative search keywords.</comment>+ <data name="TestersGroupDisplayTitle" xml:space="preserve">+ <value>Testers</value></data>- <data name="ShortDisplayTitle" xml:space="preserve">- <value>QR Code</value>+ <data name="TextGroupAccessibleName" xml:space="preserve">+ <value>Text</value>+ </data>+ <data name="TextGroupDisplayTitle" xml:space="preserve">+ <value>Text</value></data></root>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/Testers/TestersGroup.cs b/src/app/dev/DevToys.Blazor/BuiltInGroups/TestersGroup.cssimilarity index 63%rename from src/app/dev/DevToys.Tools/Tools/Testers/TestersGroup.csrename to src/app/dev/DevToys.Blazor/BuiltInGroups/TestersGroup.csindex 00c80a71e..0bc8a44cb 100644--- a/src/app/dev/DevToys.Tools/Tools/Testers/TestersGroup.cs+++ b/src/app/dev/DevToys.Blazor/BuiltInGroups/TestersGroup.cs@@ -1,4 +1,4 @@-namespace DevToys.Tools.Tools.Testers;+namespace DevToys.Blazor.BuiltInGroups;[Export(typeof(GuiToolGroup))][Name(PredefinedCommonToolGroupNames.Testers)]@@ -9,7 +9,7 @@ internal sealed class TestersGroup : GuiToolGroup{IconFontName = "FluentSystemIcons";IconGlyph = '\uE33B';- DisplayTitle = Testers.DisplayTitle;- AccessibleName = Testers.AccessibleName;+ DisplayTitle = Groups.TestersGroupDisplayTitle;+ AccessibleName = Groups.TestersGroupAccessibleName;}}diff --git a/src/app/dev/DevToys.Tools/Tools/Text/TextGroup.cs b/src/app/dev/DevToys.Blazor/BuiltInGroups/TextGroup.cssimilarity index 63%rename from src/app/dev/DevToys.Tools/Tools/Text/TextGroup.csrename to src/app/dev/DevToys.Blazor/BuiltInGroups/TextGroup.csindex a8938a66e..82501072e 100644--- a/src/app/dev/DevToys.Tools/Tools/Text/TextGroup.cs+++ b/src/app/dev/DevToys.Blazor/BuiltInGroups/TextGroup.cs@@ -1,4 +1,4 @@-namespace DevToys.Tools.Tools.Text;+namespace DevToys.Blazor.BuiltInGroups;[Export(typeof(GuiToolGroup))][Name(PredefinedCommonToolGroupNames.Text)]@@ -9,7 +9,7 @@ internal sealed class TextGroup : GuiToolGroup{IconFontName = "DevToys-Tools-Icons";IconGlyph = '\u0132';- DisplayTitle = Text.DisplayTitle;- AccessibleName = Text.AccessibleName;+ DisplayTitle = Groups.TextGroupDisplayTitle;+ AccessibleName = Groups.TextGroupAccessibleName;}}diff --git a/src/app/dev/DevToys.Blazor/BuiltInTools/DevToysBlazorResourceManagerAssemblyIdentifier.cs b/src/app/dev/DevToys.Blazor/BuiltInTools/DevToysBlazorResourceManagerAssemblyIdentifier.csindex 88b8b1d1f..2664153c0 100644--- a/src/app/dev/DevToys.Blazor/BuiltInTools/DevToysBlazorResourceManagerAssemblyIdentifier.cs+++ b/src/app/dev/DevToys.Blazor/BuiltInTools/DevToysBlazorResourceManagerAssemblyIdentifier.cs@@ -9,12 +9,15 @@ public sealed class DevToysBlazorResourceManagerAssemblyIdentifier : IResourceAspublic ValueTask<FontDefinition[]> GetFontDefinitionsAsync(){var assembly = Assembly.GetExecutingAssembly();- string resourceName = "DevToys.Blazor.Assets.fonts.FluentSystemIcons-Regular.ttf";+ string fluentSystemIconsResourceName = "DevToys.Blazor.Assets.fonts.FluentSystemIcons-Regular.ttf";+ string devToysToolsIconsResourceName = "DevToys.Blazor.Assets.fonts.DevToys-Tools-Icons.ttf";- Stream stream = assembly.GetManifestResourceStream(resourceName)!;- return new ValueTask<FontDefinition[]>(new[]- {- new FontDefinition("FluentSystemIcons", stream)- });+ Stream fluentSystemIconsResourceStream = assembly.GetManifestResourceStream(fluentSystemIconsResourceName)!;+ Stream devToysToolsIconsResourceStream = assembly.GetManifestResourceStream(devToysToolsIconsResourceName)!;+ return new ValueTask<FontDefinition[]>(+ [+ new FontDefinition("FluentSystemIcons", fluentSystemIconsResourceStream),+ new FontDefinition("DevToys-Tools-Icons", devToysToolsIconsResourceStream)+ ]);}}diff --git a/src/app/dev/DevToys.Blazor/BuiltInTools/Settings/Settings.Designer.cs b/src/app/dev/DevToys.Blazor/BuiltInTools/Settings/Settings.Designer.csindex b2d98184e..f0d16b62a 100644--- a/src/app/dev/DevToys.Blazor/BuiltInTools/Settings/Settings.Designer.cs+++ b/src/app/dev/DevToys.Blazor/BuiltInTools/Settings/Settings.Designer.cs@@ -250,7 +250,7 @@ namespace DevToys.Blazor.BuiltInTools.Settings {}/// <summary>- /// Looks up a localized string similar to Higlight the current line.+ /// Looks up a localized string similar to Highlight the current line./// </summary>internal static string HighlightCurrentLineStateDescriptionWhenOn {get {diff --git a/src/app/dev/DevToys.Blazor/DevToys.Blazor.csproj b/src/app/dev/DevToys.Blazor/DevToys.Blazor.csprojindex 36db0125a..ce86bf4f6 100644--- a/src/app/dev/DevToys.Blazor/DevToys.Blazor.csproj+++ b/src/app/dev/DevToys.Blazor/DevToys.Blazor.csproj@@ -41,35 +41,30 @@</ItemGroup><ItemGroup>- <Content Remove="Assets\samples\json-sample.json" />- </ItemGroup>-- <ItemGroup>+ <EmbeddedResource Include="..\..\..\..\assets\font\DevToys-Tools-Icons.ttf" Link="Assets\fonts\DevToys-Tools-Icons.ttf">+ <ExcludeFromSingleFile>true</ExcludeFromSingleFile>+ </EmbeddedResource><EmbeddedResource Include="Assets\fonts\FluentSystemIcons-Regular.ttf"><ExcludeFromSingleFile>true</ExcludeFromSingleFile></EmbeddedResource><EmbeddedResource Include="Assets\samples\json-sample.json" />- <EmbeddedResource Update="BuiltInTools\ExtensionsManager\ExtensionsManager.resx">- <Generator>ResXFileCodeGenerator</Generator>- <LastGenOutput>ExtensionsManager.Designer.cs</LastGenOutput>- </EmbeddedResource>- <EmbeddedResource Update="BuiltInTools\Settings\Settings.resx">- <LastGenOutput>Settings.Designer.cs</LastGenOutput>- <Generator>ResXFileCodeGenerator</Generator>- </EmbeddedResource>- <EmbeddedResource Update="BuiltInTools\SupportDevelopment\SupportDevelopment.resx">- <Generator>ResXFileCodeGenerator</Generator>- <LastGenOutput>SupportDevelopment.Designer.cs</LastGenOutput>- </EmbeddedResource>+ </ItemGroup>++ <ItemGroup>+ <Compile Update="BuiltInGroups\Groups.Designer.cs">+ <DesignTime>True</DesignTime>+ <AutoGen>True</AutoGen>+ <DependentUpon>Groups.resx</DependentUpon>+ </Compile><Compile Update="BuiltInTools\ExtensionsManager\ExtensionsManager.Designer.cs"><DesignTime>True</DesignTime><AutoGen>True</AutoGen><DependentUpon>ExtensionsManager.resx</DependentUpon></Compile><Compile Update="BuiltInTools\Settings\Settings.Designer.cs">- <DependentUpon>Settings.resx</DependentUpon><DesignTime>True</DesignTime><AutoGen>True</AutoGen>+ <DependentUpon>Settings.resx</DependentUpon></Compile><Compile Update="BuiltInTools\SupportDevelopment\SupportDevelopment.Designer.cs"><DesignTime>True</DesignTime>@@ -77,6 +72,24 @@<DependentUpon>SupportDevelopment.resx</DependentUpon></Compile></ItemGroup>+ <ItemGroup>+ <EmbeddedResource Update="BuiltInGroups\Groups.resx">+ <Generator>ResXFileCodeGenerator</Generator>+ <LastGenOutput>Groups.Designer.cs</LastGenOutput>+ </EmbeddedResource>+ <EmbeddedResource Update="BuiltInTools\ExtensionsManager\ExtensionsManager.resx">+ <Generator>ResXFileCodeGenerator</Generator>+ <LastGenOutput>ExtensionsManager.Designer.cs</LastGenOutput>+ </EmbeddedResource>+ <EmbeddedResource Update="BuiltInTools\Settings\Settings.resx">+ <Generator>ResXFileCodeGenerator</Generator>+ <LastGenOutput>Settings.Designer.cs</LastGenOutput>+ </EmbeddedResource>+ <EmbeddedResource Update="BuiltInTools\SupportDevelopment\SupportDevelopment.resx">+ <Generator>ResXFileCodeGenerator</Generator>+ <LastGenOutput>SupportDevelopment.Designer.cs</LastGenOutput>+ </EmbeddedResource>+ </ItemGroup><!-- Target ran on `dotnet restore -p:RestoreNpm=true` --><Target Name="NodeJsRestoreTarget" AfterTargets="_GenerateRestoreProjectSpec" Condition="$(RestoreNpm) == 'true'">diff --git a/src/app/dev/DevToys.Tools/Assets/GitHubMarkdown/index.html b/src/app/dev/DevToys.Tools/Assets/GitHubMarkdown/index.htmldeleted file mode 100644index a39ac55ae..000000000--- a/src/app/dev/DevToys.Tools/Assets/GitHubMarkdown/index.html+++ /dev/null@@ -1,1021 +0,0 @@-<!doctype html>-<html>-<head>- <meta charset="utf-8">- <meta name="viewport" content="width=device-width, initial-scale=1, minimal-ui">- <title>DevToys Markdown Preview</title>- <style>- div[data-theme='dark'] {- color-scheme: dark;- --color-prettylights-syntax-comment: #8b949e;- --color-prettylights-syntax-constant: #79c0ff;- --color-prettylights-syntax-entity: #d2a8ff;- --color-prettylights-syntax-storage-modifier-import: #c9d1d9;- --color-prettylights-syntax-entity-tag: #7ee787;- --color-prettylights-syntax-keyword: #ff7b72;- --color-prettylights-syntax-string: #a5d6ff;- --color-prettylights-syntax-variable: #ffa657;- --color-prettylights-syntax-brackethighlighter-unmatched: #f85149;- --color-prettylights-syntax-invalid-illegal-text: #f0f6fc;- --color-prettylights-syntax-invalid-illegal-bg: #8e1519;- --color-prettylights-syntax-carriage-return-text: #f0f6fc;- --color-prettylights-syntax-carriage-return-bg: #b62324;- --color-prettylights-syntax-string-regexp: #7ee787;- --color-prettylights-syntax-markup-list: #f2cc60;- --color-prettylights-syntax-markup-heading: #1f6feb;- --color-prettylights-syntax-markup-italic: #c9d1d9;- --color-prettylights-syntax-markup-bold: #c9d1d9;- --color-prettylights-syntax-markup-deleted-text: #ffdcd7;- --color-prettylights-syntax-markup-deleted-bg: #67060c;- --color-prettylights-syntax-markup-inserted-text: #aff5b4;- --color-prettylights-syntax-markup-inserted-bg: #033a16;- --color-prettylights-syntax-markup-changed-text: #ffdfb6;- --color-prettylights-syntax-markup-changed-bg: #5a1e02;- --color-prettylights-syntax-markup-ignored-text: #c9d1d9;- --color-prettylights-syntax-markup-ignored-bg: #1158c7;- --color-prettylights-syntax-meta-diff-range: #d2a8ff;- --color-prettylights-syntax-brackethighlighter-angle: #8b949e;- --color-prettylights-syntax-sublimelinter-gutter-mark: #484f58;- --color-prettylights-syntax-constant-other-reference-link: #a5d6ff;- --color-fg-default: #c9d1d9;- --color-fg-muted: #8b949e;- --color-fg-subtle: #484f58;- --color-canvas-default: #0d1117;- --color-canvas-subtle: #161b22;- --color-border-default: #30363d;- --color-border-muted: #21262d;- --color-neutral-muted: rgba(110,118,129,0.4);- --color-accent-fg: #58a6ff;- --color-accent-emphasis: #1f6feb;- --color-danger-fg: #f85149;- }-- div[data-theme='light'] {- color-scheme: light;- --color-prettylights-syntax-comment: #6e7781;- --color-prettylights-syntax-constant: #0550ae;- --color-prettylights-syntax-entity: #8250df;- --color-prettylights-syntax-storage-modifier-import: #24292f;- --color-prettylights-syntax-entity-tag: #116329;- --color-prettylights-syntax-keyword: #cf222e;- --color-prettylights-syntax-string: #0a3069;- --color-prettylights-syntax-variable: #953800;- --color-prettylights-syntax-brackethighlighter-unmatched: #82071e;- --color-prettylights-syntax-invalid-illegal-text: #f6f8fa;- --color-prettylights-syntax-invalid-illegal-bg: #82071e;- --color-prettylights-syntax-carriage-return-text: #f6f8fa;- --color-prettylights-syntax-carriage-return-bg: #cf222e;- --color-prettylights-syntax-string-regexp: #116329;- --color-prettylights-syntax-markup-list: #3b2300;- --color-prettylights-syntax-markup-heading: #0550ae;- --color-prettylights-syntax-markup-italic: #24292f;- --color-prettylights-syntax-markup-bold: #24292f;- --color-prettylights-syntax-markup-deleted-text: #82071e;- --color-prettylights-syntax-markup-deleted-bg: #FFEBE9;- --color-prettylights-syntax-markup-inserted-text: #116329;- --color-prettylights-syntax-markup-inserted-bg: #dafbe1;- --color-prettylights-syntax-markup-changed-text: #953800;- --color-prettylights-syntax-markup-changed-bg: #ffd8b5;- --color-prettylights-syntax-markup-ignored-text: #eaeef2;- --color-prettylights-syntax-markup-ignored-bg: #0550ae;- --color-prettylights-syntax-meta-diff-range: #8250df;- --color-prettylights-syntax-brackethighlighter-angle: #57606a;- --color-prettylights-syntax-sublimelinter-gutter-mark: #8c959f;- --color-prettylights-syntax-constant-other-reference-link: #0a3069;- --color-fg-default: #24292f;- --color-fg-muted: #57606a;- --color-fg-subtle: #6e7781;- --color-canvas-default: #ffffff;- --color-canvas-subtle: #f6f8fa;- --color-border-default: #d0d7de;- --color-border-muted: hsla(210,18%,87%,1);- --color-neutral-muted: rgba(175,184,193,0.2);- --color-accent-fg: #0969da;- --color-accent-emphasis: #0969da;- --color-danger-fg: #cf222e;- }-- body {- box-sizing: border-box;- min-width: 200px;- margin: 0 auto;- }-- .root {- min-height: 100%;- color: var(--color-fg-default);- background-color: var(--color-canvas-default);- }-- .markdown-body {- -ms-text-size-adjust: 100%;- -webkit-text-size-adjust: 100%;- margin: 0;- font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji";- font-size: 16px;- line-height: 1.5;- word-wrap: break-word;- padding: 16px;- }-- .markdown-body .octicon {- display: inline-block;- fill: currentColor;- vertical-align: text-bottom;- }-- .markdown-body h1:hover .anchor .octicon-link:before,- .markdown-body h2:hover .anchor .octicon-link:before,- .markdown-body h3:hover .anchor .octicon-link:before,- .markdown-body h4:hover .anchor .octicon-link:before,- .markdown-body h5:hover .anchor .octicon-link:before,- .markdown-body h6:hover .anchor .octicon-link:before {- width: 16px;- height: 16px;- content: ' ';- display: inline-block;- background-color: currentColor;- -webkit-mask-image: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' version='1.1' aria-hidden='true'><path fill-rule='evenodd' d='M7.775 3.275a.75.75 0 001.06 1.06l1.25-1.25a2 2 0 112.83 2.83l-2.5 2.5a2 2 0 01-2.83 0 .75.75 0 00-1.06 1.06 3.5 3.5 0 004.95 0l2.5-2.5a3.5 3.5 0 00-4.95-4.95l-1.25 1.25zm-4.69 9.64a2 2 0 010-2.83l2.5-2.5a2 2 0 012.83 0 .75.75 0 001.06-1.06 3.5 3.5 0 00-4.95 0l-2.5 2.5a3.5 3.5 0 004.95 4.95l1.25-1.25a.75.75 0 00-1.06-1.06l-1.25 1.25a2 2 0 01-2.83 0z'></path></svg>");- mask-image: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' version='1.1' aria-hidden='true'><path fill-rule='evenodd' d='M7.775 3.275a.75.75 0 001.06 1.06l1.25-1.25a2 2 0 112.83 2.83l-2.5 2.5a2 2 0 01-2.83 0 .75.75 0 00-1.06 1.06 3.5 3.5 0 004.95 0l2.5-2.5a3.5 3.5 0 00-4.95-4.95l-1.25 1.25zm-4.69 9.64a2 2 0 010-2.83l2.5-2.5a2 2 0 012.83 0 .75.75 0 001.06-1.06 3.5 3.5 0 00-4.95 0l-2.5 2.5a3.5 3.5 0 004.95 4.95l1.25-1.25a.75.75 0 00-1.06-1.06l-1.25 1.25a2 2 0 01-2.83 0z'></path></svg>");- }-- .markdown-body details,- .markdown-body figcaption,- .markdown-body figure {- display: block;- }-- .markdown-body summary {- display: list-item;- }-- .markdown-body a {- background-color: transparent;- color: var(--color-accent-fg);- text-decoration: none;- }-- .markdown-body a:active,- .markdown-body a:hover {- outline-width: 0;- }-- .markdown-body abbr[title] {- border-bottom: none;- -webkit-text-decoration: underline dotted;- text-decoration: underline dotted;- }-- .markdown-body b,- .markdown-body strong {- font-weight: 600;- }-- .markdown-body dfn {- font-style: italic;- }-- .markdown-body h1 {- margin: .67em 0;- font-weight: 600;- padding-bottom: .3em;- font-size: 2em;- border-bottom: 1px solid var(--color-border-muted);- }-- .markdown-body mark {- background-color: #ff0;- color: var(--color-text-primary);- }-- .markdown-body small {- font-size: 90%;- }-- .markdown-body sub,- .markdown-body sup {- font-size: 75%;- line-height: 0;- position: relative;- vertical-align: baseline;- }-- .markdown-body sub {- bottom: -0.25em;- }-- .markdown-body sup {- top: -0.5em;- }-- .markdown-body img {- border-style: none;- max-width: 100%;- box-sizing: content-box;- background-color: var(--color-canvas-default);- }-- .markdown-body code,- .markdown-body kbd,- .markdown-body pre,- .markdown-body samp {- font-family: monospace,monospace;- font-size: 1em;- }-- .markdown-body figure {- margin: 1em 40px;- }-- .markdown-body hr {- box-sizing: content-box;- overflow: hidden;- background: transparent;- border-bottom: 1px solid var(--color-border-muted);- height: .25em;- padding: 0;- margin: 24px 0;- background-color: var(--color-border-default);- border: 0;- }-- .markdown-body html [type=button],- .markdown-body [type=reset],- .markdown-body [type=submit] {- -webkit-appearance: button;- }-- .markdown-body [type=button]::-moz-focus-inner,- .markdown-body [type=reset]::-moz-focus-inner,- .markdown-body [type=submit]::-moz-focus-inner {- border-style: none;- padding: 0;- }-- .markdown-body [type=button]:-moz-focusring,- .markdown-body [type=reset]:-moz-focusring,- .markdown-body [type=submit]:-moz-focusring {- outline: 1px dotted ButtonText;- }-- .markdown-body [type=checkbox],- .markdown-body [type=radio] {- box-sizing: border-box;- padding: 0;- }-- .markdown-body [type=number]::-webkit-inner-spin-button,- .markdown-body [type=number]::-webkit-outer-spin-button {- height: auto;- }-- .markdown-body [type=search] {- -webkit-appearance: textfield;- outline-offset: -2px;- }-- .markdown-body [type=search]::-webkit-search-cancel-button,- .markdown-body [type=search]::-webkit-search-decoration {- -webkit-appearance: none;- }-- .markdown-body ::-webkit-input-placeholder {- color: inherit;- opacity: .54;- }-- .markdown-body ::-webkit-file-upload-button {- -webkit-appearance: button;- font: inherit;- }-- .markdown-body a:hover {- text-decoration: underline;- }-- .markdown-body hr::before {- display: table;- content: "";- }-- .markdown-body hr::after {- display: table;- clear: both;- content: "";- }-- .markdown-body table {- border-spacing: 0;- border-collapse: collapse;- display: block;- width: max-content;- max-width: 100%;- overflow: auto;- }-- .markdown-body td,- .markdown-body th {- padding: 0;- }-- .markdown-body details summary {- cursor: pointer;- }-- .markdown-body details:not([open]) > *:not(summary) {- display: none !important;- }-- .markdown-body kbd {- display: inline-block;- padding: 3px 5px;- font: 11px ui-monospace,SFMono-Regular,SF Mono,Menlo,Consolas,Liberation Mono,monospace;- line-height: 10px;- color: var(--color-fg-default);- vertical-align: middle;- background-color: var(--color-canvas-subtle);- border: solid 1px var(--color-neutral-muted);- border-bottom-color: var(--color-neutral-muted);- border-radius: 6px;- box-shadow: inset 0 -1px 0 var(--color-neutral-muted);- }-- .markdown-body h1,- .markdown-body h2,- .markdown-body h3,- .markdown-body h4,- .markdown-body h5,- .markdown-body h6 {- margin-top: 24px;- margin-bottom: 16px;- font-weight: 600;- line-height: 1.25;- }-- .markdown-body h2 {- font-weight: 600;- padding-bottom: .3em;- font-size: 1.5em;- border-bottom: 1px solid var(--color-border-muted);- }-- .markdown-body h3 {- font-weight: 600;- font-size: 1.25em;- }-- .markdown-body h4 {- font-weight: 600;- font-size: 1em;- }-- .markdown-body h5 {- font-weight: 600;- font-size: .875em;- }-- .markdown-body h6 {- font-weight: 600;- font-size: .85em;- color: var(--color-fg-muted);- }-- .markdown-body p {- margin-top: 0;- margin-bottom: 10px;- }-- .markdown-body blockquote {- margin: 0;- padding: 0 1em;- color: var(--color-fg-muted);- border-left: .25em solid var(--color-border-default);- }-- .markdown-body ul,- .markdown-body ol {- margin-top: 0;- margin-bottom: 0;- padding-left: 2em;- }-- .markdown-body ol ol,- .markdown-body ul ol {- list-style-type: lower-roman;- }-- .markdown-body ul ul ol,- .markdown-body ul ol ol,- .markdown-body ol ul ol,- .markdown-body ol ol ol {- list-style-type: lower-alpha;- }-- .markdown-body dd {- margin-left: 0;- }-- .markdown-body tt,- .markdown-body code {- font-family: ui-monospace,SFMono-Regular,SF Mono,Menlo,Consolas,Liberation Mono,monospace;- font-size: 12px;- }-- .markdown-body pre {- margin-top: 0;- margin-bottom: 0;- font-family: ui-monospace,SFMono-Regular,SF Mono,Menlo,Consolas,Liberation Mono,monospace;- font-size: 12px;- word-wrap: normal;- }-- .markdown-body :-ms-input-placeholder {- color: var(--color-fg-subtle);- opacity: 1;- }-- .markdown-body ::-ms-input-placeholder {- color: var(--color-fg-subtle);- opacity: 1;- }-- .markdown-body ::placeholder {- color: var(--color-fg-subtle);- opacity: 1;- }-- .markdown-body .pl-c {- color: var(--color-prettylights-syntax-comment);- }-- .markdown-body .pl-c1,- .markdown-body .pl-s .pl-v {- color: var(--color-prettylights-syntax-constant);- }-- .markdown-body .pl-e,- .markdown-body .pl-en {- color: var(--color-prettylights-syntax-entity);- }-- .markdown-body .pl-smi,- .markdown-body .pl-s .pl-s1 {- color: var(--color-prettylights-syntax-storage-modifier-import);- }-- .markdown-body .pl-ent {- color: var(--color-prettylights-syntax-entity-tag);- }-- .markdown-body .pl-k {- color: var(--color-prettylights-syntax-keyword);- }-- .markdown-body .pl-s,- .markdown-body .pl-pds,- .markdown-body .pl-s .pl-pse .pl-s1,- .markdown-body .pl-sr,- .markdown-body .pl-sr .pl-cce,- .markdown-body .pl-sr .pl-sre,- .markdown-body .pl-sr .pl-sra {- color: var(--color-prettylights-syntax-string);- }-- .markdown-body .pl-v,- .markdown-body .pl-smw {- color: var(--color-prettylights-syntax-variable);- }-- .markdown-body .pl-bu {- color: var(--color-prettylights-syntax-brackethighlighter-unmatched);- }-- .markdown-body .pl-ii {- color: var(--color-prettylights-syntax-invalid-illegal-text);- background-color: var(--color-prettylights-syntax-invalid-illegal-bg);- }-- .markdown-body .pl-c2 {- color: var(--color-prettylights-syntax-carriage-return-text);- background-color: var(--color-prettylights-syntax-carriage-return-bg);- }-- .markdown-body .pl-sr .pl-cce {- font-weight: bold;- color: var(--color-prettylights-syntax-string-regexp);- }-- .markdown-body .pl-ml {- color: var(--color-prettylights-syntax-markup-list);- }-- .markdown-body .pl-mh,- .markdown-body .pl-mh .pl-en,- .markdown-body .pl-ms {- font-weight: bold;- color: var(--color-prettylights-syntax-markup-heading);- }-- .markdown-body .pl-mi {- font-style: italic;- color: var(--color-prettylights-syntax-markup-italic);- }-- .markdown-body .pl-mb {- font-weight: bold;- color: var(--color-prettylights-syntax-markup-bold);- }-- .markdown-body .pl-md {- color: var(--color-prettylights-syntax-markup-deleted-text);- background-color: var(--color-prettylights-syntax-markup-deleted-bg);- }-- .markdown-body .pl-mi1 {- color: var(--color-prettylights-syntax-markup-inserted-text);- background-color: var(--color-prettylights-syntax-markup-inserted-bg);- }-- .markdown-body .pl-mc {- color: var(--color-prettylights-syntax-markup-changed-text);- background-color: var(--color-prettylights-syntax-markup-changed-bg);- }-- .markdown-body .pl-mi2 {- color: var(--color-prettylights-syntax-markup-ignored-text);- background-color: var(--color-prettylights-syntax-markup-ignored-bg);- }-- .markdown-body .pl-mdr {- font-weight: bold;- color: var(--color-prettylights-syntax-meta-diff-range);- }-- .markdown-body .pl-ba {- color: var(--color-prettylights-syntax-brackethighlighter-angle);- }-- .markdown-body .pl-sg {- color: var(--color-prettylights-syntax-sublimelinter-gutter-mark);- }-- .markdown-body .pl-corl {- text-decoration: underline;- color: var(--color-prettylights-syntax-constant-other-reference-link);- }-- .markdown-body [data-catalyst] {- display: block;- }-- .markdown-body g-emoji {- font-family: "Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol";- font-size: 1em;- font-style: normal !important;- font-weight: 400;- line-height: 1;- vertical-align: -0.075em;- }-- .markdown-body g-emoji img {- width: 1em;- height: 1em;- }-- .markdown-body::before {- display: table;- content: "";- }-- .markdown-body::after {- display: table;- clear: both;- content: "";- }-- .markdown-body > *:first-child {- margin-top: 0 !important;- }-- .markdown-body > *:last-child {- margin-bottom: 0 !important;- }-- .markdown-body a:not([href]) {- color: inherit;- text-decoration: none;- }-- .markdown-body .absent {- color: var(--color-danger-fg);- }-- .markdown-body .anchor {- float: left;- padding-right: 4px;- margin-left: -20px;- line-height: 1;- }-- .markdown-body .anchor:focus {- outline: none;- }-- .markdown-body p,- .markdown-body blockquote,- .markdown-body ul,- .markdown-body ol,- .markdown-body dl,- .markdown-body table,- .markdown-body pre,- .markdown-body details {- margin-top: 0;- margin-bottom: 16px;- }-- .markdown-body blockquote > :first-child {- margin-top: 0;- }-- .markdown-body blockquote > :last-child {- margin-bottom: 0;- }-- .markdown-body sup > a::before {- content: "[";- }-- .markdown-body sup > a::after {- content: "]";- }-- .markdown-body h1 .octicon-link,- .markdown-body h2 .octicon-link,- .markdown-body h3 .octicon-link,- .markdown-body h4 .octicon-link,- .markdown-body h5 .octicon-link,- .markdown-body h6 .octicon-link {- color: var(--color-fg-default);- vertical-align: middle;- visibility: hidden;- }-- .markdown-body h1:hover .anchor,- .markdown-body h2:hover .anchor,- .markdown-body h3:hover .anchor,- .markdown-body h4:hover .anchor,- .markdown-body h5:hover .anchor,- .markdown-body h6:hover .anchor {- text-decoration: none;- }-- .markdown-body h1:hover .anchor .octicon-link,- .markdown-body h2:hover .anchor .octicon-link,- .markdown-body h3:hover .anchor .octicon-link,- .markdown-body h4:hover .anchor .octicon-link,- .markdown-body h5:hover .anchor .octicon-link,- .markdown-body h6:hover .anchor .octicon-link {- visibility: visible;- }-- .markdown-body h1 tt,- .markdown-body h1 code,- .markdown-body h2 tt,- .markdown-body h2 code,- .markdown-body h3 tt,- .markdown-body h3 code,- .markdown-body h4 tt,- .markdown-body h4 code,- .markdown-body h5 tt,- .markdown-body h5 code,- .markdown-body h6 tt,- .markdown-body h6 code {- padding: 0 .2em;- font-size: inherit;- }-- .markdown-body ul.no-list,- .markdown-body ol.no-list {- padding: 0;- list-style-type: none;- }-- .markdown-body ol[type="1"] {- list-style-type: decimal;- }-- .markdown-body ol[type=a] {- list-style-type: lower-alpha;- }-- .markdown-body ol[type=i] {- list-style-type: lower-roman;- }-- .markdown-body div > ol:not([type]) {- list-style-type: decimal;- }-- .markdown-body div {- border-radius: 10px;- }-- .markdown-body ul ul,- .markdown-body ul ol,- .markdown-body ol ol,- .markdown-body ol ul {- margin-top: 0;- margin-bottom: 0;- }-- .markdown-body li > p {- margin-top: 16px;- }-- .markdown-body li + li {- margin-top: .25em;- }-- .markdown-body dl {- padding: 0;- }-- .markdown-body dl dt {- padding: 0;- margin-top: 16px;- font-size: 1em;- font-style: italic;- font-weight: 600;- }-- .markdown-body dl dd {- padding: 0 16px;- margin-bottom: 16px;- }-- .markdown-body table th {- font-weight: 600;- }-- .markdown-body table th,- .markdown-body table td {- padding: 6px 13px;- border: 1px solid var(--color-border-default);- }-- .markdown-body table tr {- background-color: var(--color-canvas-default);- border-top: 1px solid var(--color-border-muted);- }-- .markdown-body table tr:nth-child(2n) {- background-color: var(--color-canvas-subtle);- }-- .markdown-body table img {- background-color: transparent;- }-- .markdown-body img[align=right] {- padding-left: 20px;- }-- .markdown-body img[align=left] {- padding-right: 20px;- }-- .markdown-body .emoji {- max-width: none;- vertical-align: text-top;- background-color: transparent;- }-- .markdown-body span.frame {- display: block;- overflow: hidden;- }-- .markdown-body span.frame > span {- display: block;- float: left;- width: auto;- padding: 7px;- margin: 13px 0 0;- overflow: hidden;- border: 1px solid var(--color-border-default);- }-- .markdown-body span.frame span img {- display: block;- float: left;- }-- .markdown-body span.frame span span {- display: block;- padding: 5px 0 0;- clear: both;- color: var(--color-fg-default);- }-- .markdown-body span.align-center {- display: block;- overflow: hidden;- clear: both;- }-- .markdown-body span.align-center > span {- display: block;- margin: 13px auto 0;- overflow: hidden;- text-align: center;- }-- .markdown-body span.align-center span img {- margin: 0 auto;- text-align: center;- }-- .markdown-body span.align-right {- display: block;- overflow: hidden;- clear: both;- }-- .markdown-body span.align-right > span {- display: block;- margin: 13px 0 0;- overflow: hidden;- text-align: right;- }-- .markdown-body span.align-right span img {- margin: 0;- text-align: right;- }-- .markdown-body span.float-left {- display: block;- float: left;- margin-right: 13px;- overflow: hidden;- }-- .markdown-body span.float-left span {- margin: 13px 0 0;- }-- .markdown-body span.float-right {- display: block;- float: right;- margin-left: 13px;- overflow: hidden;- }-- .markdown-body span.float-right > span {- display: block;- margin: 13px auto 0;- overflow: hidden;- text-align: right;- }-- .markdown-body code,- .markdown-body tt {- padding: .2em .4em;- margin: 0;- font-size: 85%;- background-color: var(--color-neutral-muted);- border-radius: 6px;- }-- .markdown-body code br,- .markdown-body tt br {- display: none;- }-- .markdown-body del code {- text-decoration: inherit;- }-- .markdown-body pre code {- font-size: 100%;- }-- .markdown-body pre > code {- padding: 0;- margin: 0;- word-break: normal;- white-space: pre;- background: transparent;- border: 0;- }-- .markdown-body .highlight {- margin-bottom: 16px;- }-- .markdown-body .highlight pre {- margin-bottom: 0;- word-break: normal;- }-- .markdown-body .highlight pre,- .markdown-body pre {- padding: 16px;- overflow: auto;- font-size: 85%;- line-height: 1.45;- background-color: var(--color-canvas-subtle);- border-radius: 6px;- }-- .markdown-body pre code,- .markdown-body pre tt {- display: inline;- max-width: auto;- padding: 0;- margin: 0;- overflow: visible;- line-height: inherit;- word-wrap: normal;- background-color: transparent;- border: 0;- }-- .markdown-body .csv-data td,- .markdown-body .csv-data th {- padding: 5px;- overflow: hidden;- font-size: 12px;- line-height: 1;- text-align: left;- white-space: nowrap;- }-- .markdown-body .csv-data .blob-num {- padding: 10px 8px 9px;- text-align: right;- background: var(--color-canvas-default);- border: 0;- }-- .markdown-body .csv-data tr {- border-top: 0;- }-- .markdown-body .csv-data th {- font-weight: 600;- background: var(--color-canvas-subtle);- border-top: 0;- }-- .markdown-body .footnotes {- font-size: 12px;- color: var(--color-fg-muted);- border-top: 1px solid var(--color-border-default);- }-- .markdown-body .footnotes ol {- padding-left: 16px;- }-- .markdown-body .footnotes li {- position: relative;- }-- .markdown-body .footnotes li:target::before {- position: absolute;- top: -8px;- right: -8px;- bottom: -8px;- left: -24px;- pointer-events: none;- content: "";- border: 2px solid var(--color-accent-emphasis);- border-radius: 6px;- }-- .markdown-body .footnotes li:target {- color: var(--color-fg-default);- }-- .markdown-body .footnotes .data-footnote-backref g-emoji {- font-family: monospace;- }-- .markdown-body [hidden] {- display: none !important;- }-- .markdown-body ::-webkit-calendar-picker-indicator {- filter: invert(50%);- }- </style>-</head>-<body>- <div class="root" data-theme="{{renderTheme}}">- <article class="markdown-body">- {{htmlBody}}- </article>- </div>-</body>-</html>diff --git a/src/app/dev/DevToys.Tools/Assets/Lipsums/LICENSE.MD b/src/app/dev/DevToys.Tools/Assets/Lipsums/LICENSE.MDdeleted file mode 100644index a1c97e383..000000000--- a/src/app/dev/DevToys.Tools/Assets/Lipsums/LICENSE.MD+++ /dev/null@@ -1,21 +0,0 @@-The MIT License--Copyright (c) 2007 Alex Pendleton--Permission is hereby granted, free of charge, to any person obtaining a copy-of this software and associated documentation files (the "Software"), to deal-in the Software without restriction, including without limitation the rights-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell-copies of the Software, and to permit persons to whom the Software is-furnished to do so, subject to the following conditions:--The above copyright notice and this permission notice shall be included in-all copies or substantial portions of the Software.--THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN-THE SOFTWARE.\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Assets/Lipsums/childharold.xml b/src/app/dev/DevToys.Tools/Assets/Lipsums/childharold.xmldeleted file mode 100644index 8d7edf9bd..000000000--- a/src/app/dev/DevToys.Tools/Assets/Lipsums/childharold.xml+++ /dev/null@@ -1,109 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>--<!-- This is a template file for custom lipsum texts -->-<lipsum>- <copyright>This text is under public domain</copyright>- <title>Childe Harold's Pilgrimage - Canto the first (I.-X.)</title>- <author>Lord Byron</author>- <text>- oh thou in hellas deemed of heavenly birth- muse formed or fabled at the minstrels will- since shamed full oft by later lyres on earth- mine dares not call thee from thy sacred hill- yet there ive wandered by thy vaunted rill- yes sighed oer delphis longdeserted shrine- where save that feeble fountain all is still- nor mote my shell awake the weary nine- to grace so plain a talethis lowly lay of mine-- whilome in albions isle there dwelt a youth- who ne in virtues ways did take delight- but spent his days in riot most uncouth- and vexed with mirth the drowsy ear of night- ah me in sooth he was a shameless wight- sore given to revel and ungodly glee- few earthly things found favour in his sight- save concubines and carnal companie- and flaunting wassailers of high and low degree-- childe harold was he hight but whence his name- and lineage long it suits me not to say- suffice it that perchance they were of fame- and had been glorious in another day- but one sad losel soils a name for aye- however mighty in the olden time- nor all that heralds rake from coffined clay- nor florid prose nor honeyed lines of rhyme- can blazon evil deeds or consecrate a crime-- childe harold basked him in the noontide sun- disporting there like any other fly- nor deemed before his little day was done- one blast might chill him into misery- but long ere scarce a third of his passed by- worse than adversity the childe befell- he felt the fulness of satiety- then loathed he in his native land to dwell- which seemed to him more lone than eremites sad cell-- for he through sins long labyrinth had run- nor made atonement when he did amiss- had sighed to many though he loved but one- and that loved one alas could neer be his- ah happy she to scape from him whose kiss- had been pollution unto aught so chaste- who soon had left her charms for vulgar bliss- and spoiled her goodly lands to gild his waste- nor calm domestic peace had ever deigned to taste-- and now childe harold was sore sick at heart- and from his fellow bacchanals would flee- tis said at times the sullen tear would start- but pride congealed the drop within his ee- apart he stalked in joyless reverie- and from his native land resolved to go- and visit scorching climes beyond the sea- with pleasure drugged he almost longed for woe- and een for change of scene would seek the shades below-- the childe departed from his fathers hall- it was a vast and venerable pile- so old it seemed only not to fall- yet strength was pillared in each massy aisle- monastic dome condemned to uses vile- where superstition once had made her den- now paphian girls were known to sing and smile- and monks might deem their time was come agen- if ancient tales say true nor wrong these holy men-- yet ofttimes in his maddest mirthful mood- strange pangs would flash along childe harolds brow- as if the memory of some deadly feud- or disappointed passion lurked below- but this none knew nor haply cared to know- for his was not that open artless soul- that feels relief by bidding sorrow flow- nor sought he friend to counsel or condole- whateer this grief mote be which he could not control-- and none did love him though to hall and bower- he gathered revellers from far and near- he knew them flatterers of the festal hour- the heartless parasites of present cheer- yea none did love himnot his lemans dear- but pomp and power alone are womans care- and where these are light eros finds a feere- maidens like moths are ever caught by glare- and mammon wins his way where seraphs might despair-- childe harold had a mothernot forgot- though parting from that mother he did shun- a sister whom he loved but saw her not- before his weary pilgrimage begun- if friends he had he bade adieu to none- yet deem not thence his breast a breast of steel- ye who have known what tis to dote upon- a few dear objects will in sadness feel- such partings break the heart they fondly hope to heal- </text>-</lipsum>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Assets/Lipsums/decameron.xml b/src/app/dev/DevToys.Tools/Assets/Lipsums/decameron.xmldeleted file mode 100644index dba9da3f6..000000000--- a/src/app/dev/DevToys.Tools/Assets/Lipsums/decameron.xml+++ /dev/null@@ -1,10 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>--<lipsum>- <copyright>This text is under public domain</copyright>- <title>Decameron - Novella Prima</title>- <author>Giovanni Boccaccio</author>- <text>- convenevole cosa e carissime donne che ciascheduna cosa la quale l'uomo fa dallo ammirabile e santo nome di colui il quale di tutte fu facitore le dea principio per che dovendo io al vostro novellare sí come primo dare cominciamento intendo da una delle sue maravigliose cose incominciare accio che quella udita la nostra speranza in lui sí come in cosa impermutabile si fermi e sempre sia da noi il suo nome lodato manifesta cosa e che sí come le cose temporali tutte sono transitorie e mortali cosí in sé e fuor di sé esser piene di noia d'angoscia e di fatica e a infiniti pericoli sogiacere alle quali senza niuno fallo né potremmo noi che viviamo mescolati in esse e che siamo parte d'esse durare né ripararci se spezial grazia di dio forza e avvedimento non ci prestasse la quale a noi e in noi non e da credere che per alcun nostro merito discenda ma dalla sua propria benignita mossa e da' prieghi di coloro impetrata che sí come noi siamo furon mortali e bene i suoi piaceri mentre furono in vita seguendo ora con lui eterni son divenuti e beati alli quali noi medesimi sí come a procuratori informati per esperienza della nostra fragilita forse non audaci di porgere i prieghi nostri nel cospetto di tanto giudice delle cose le quali a noi reputiamo oportune gli porgiamo e ancora piú in lui verso noi di pietosa liberalita pieno discerniamo che non potendo l'acume dell'occhio mortale nel segreto della divina mente trapassare in alcun modo avvien forse tal volta che da oppinione ingannati tale dinanzi alla sua maesta facciamo procuratore che da quella con etterno essilio e iscacciato e nondimeno esso al quale niuna cosa e occulta piú alla purita del pregator riguardando che alla sua ignoranza o allo essilio del pregato cosí come se quegli fosse nel suo cospetto beato essaudisce coloro che 'l priegano il che manifestamente potra apparire nella novella la quale di raccontare intendo manifestamente dico non il giudicio di dio ma quel degli uomini seguitando- </text>-</lipsum>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Assets/Lipsums/faust.xml b/src/app/dev/DevToys.Tools/Assets/Lipsums/faust.xmldeleted file mode 100644index bb502eac1..000000000--- a/src/app/dev/DevToys.Tools/Assets/Lipsums/faust.xml+++ /dev/null@@ -1,44 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>--<lipsum>- <copyright>This text is under public domain</copyright>- <title>Faust: Der Tragödie erster Teil</title>- <author>Johann Wolfgang von Goethe</author>- <text>- ihr naht euch wieder schwankende gestalten- die früh sich einst dem trüben blick gezeigt- versuch ich wohl euch diesmal festzuhalten- fühl ich mein herz noch jenem wahn geneigt- ihr drängt euch zu nun gut so mögt ihr walten- wie ihr aus dunst und nebel um mich steigt- mein busen fühlt sich jugendlich erschüttert- vom zauberhauch der euren zug umwittert-- ihr bringt mit euch die bilder froher tage- und manche liebe schatten steigen auf- gleich einer alten halbverklungnen sage- kommt erste lieb und freundschaft mit herauf- der schmerz wird neu es wiederholt die klage- des lebens labyrinthisch irren lauf- und nennt die guten die um schöne stunden- vom glück getäuscht vor mir hinweggeschwunden-- sie hören nicht die folgenden gesänge- die seelen denen ich die ersten sang- zerstoben ist das freundliche gedränge- verklungen ach der erste widerklang- mein lied ertönt der unbekannten menge- ihr beifall selbst macht meinem herzen bang- und was sich sonst an meinem lied erfreuet- wenn es noch lebt irrt in der welt zerstreuet-- und mich ergreift ein längst entwöhntes sehnen- nach jenem stillen ernsten geisterreich- es schwebet nun in unbestimmten tönen- mein lispelnd lied der äolsharfe gleich- ein schauer faßt mich träne folgt den tränen- das strenge herz es fühlt sich mild und weich- was ich besitze seh ich wie im weiten- und was verschwand wird mir zu wirklichkeiten- </text>-</lipsum>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Assets/Lipsums/inderfremde.xml b/src/app/dev/DevToys.Tools/Assets/Lipsums/inderfremde.xmldeleted file mode 100644index 7389f8cfa..000000000--- a/src/app/dev/DevToys.Tools/Assets/Lipsums/inderfremde.xml+++ /dev/null@@ -1,133 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>--<lipsum>- <copyright>This text is under public domain</copyright>- <title>Le Bateau Ivre</title>- <author>Arthur Rimbaud</author>- <text>- comme je descendais des fleuves impassibles- je ne me sentis plus guidé par les haleurs- des peaux-rouges criards les avaient pris pour cibles- les ayant cloués nus aux poteaux de couleurs-- j'étais insoucieux de tous les équipages- porteur de blés flamands ou de cotons anglais- quand avec mes haleurs ont fini ces tapages- les fleuves m'ont laissé descendre ou je voulais-- dans les clapotements furieux des marées- moi l'autre hiver plus sourd que les cerveaux d'enfants- je courus et les péninsules démarrées- n'ont pas subi tohu-bohus plus triomphants-- la tempete a béni mes éveils maritimes- plus léger qu'un bouchon j'ai dansé sur les flots- qu'on appelle rouleurs éternels de victimes- dix nuits sans regretter l'oeil niais des falots-- plus douce qu'aux enfants la chair des pommes sures- l'eau verte pénétra ma coque de sapin- et des taches de vins bleus et des vomissures- me lava dispersant gouvernail et grappin-- et des lors je me suis baigné dans le poeme- de la mer infusé d'astres et lactescent- dévorant les azurs verts ou flottaison bleme- et ravie un noyé pensif parfois descend-- ou teignant tout a coup les bleuités délires- et rythmes lents sous les rutilements du jour- plus fortes que l'alcool plus vastes que nos lyres- fermentent les rousseurs ameres de l'amour-- je sais les cieux crevant en éclairs et les trombes- et les ressacs et les courants je sais le soir- l'aube exaltée ainsi qu'un peuple de colombes- et j'ai vu quelque fois ce que l'homme a cru voir-- j'ai vu le soleil bas taché d'horreurs mystiques- illuminant de longs figements violets- pareils a des acteurs de drames tres-antiques- les flots roulant au loin leurs frissons de volets-- j'ai revé la nuit verte aux neiges éblouies- baiser montant aux yeux des mers avec lenteurs- la circulation des seves inouies- et l'éveil jaune et bleu des phosphores chanteurs-- j'ai suivi des mois pleins pareille aux vacheries- hystériques la houle a l'assaut des récifs- sans songer que les pieds lumineux des maries- pussent forcer le mufle aux océans poussifs-- j'ai heurté savez-vous d'incroyables florides- melant aux fleurs des yeux de pantheres a peaux- d'hommes des arcs-en-ciel tendus comme des brides- sous l'horizon des mers a de glauques troupeaux-- j'ai vu fermenter les marais énormes nasses- ou pourrit dans les joncs tout un léviathan- des écroulement d'eau au milieu des bonaces- et les lointains vers les gouffres cataractant-- glaciers soleils d'argent flots nacreux cieux de braises- échouages hideux au fond des golfes bruns- ou les serpents géants dévorés de punaises- choient des arbres tordus avec de noirs parfums-- j'aurais voulu montrer aux enfants ces dorades- du flot bleu ces poissons d'or ces poissons chantants- - des écumes de fleurs ont bercé mes dérades- et d'ineffables vents m'ont ailé par instants-- parfois martyr lassé des pôles et des zones- la mer dont le sanglot faisait mon roulis doux- montait vers moi ses fleurs d'ombres aux ventouses jaunes- et je restais ainsi qu'une femme a genoux-- presque île balottant sur mes bords les querelles- et les fientes d'oiseaux clabaudeurs aux yeux blonds- et je voguais lorsqu'a travers mes liens freles- des noyés descendaient dormir a reculons-- or moi bateau perdu sous les cheveux des anses- jeté par l'ouragan dans l'éther sans oiseau- moi dont les monitors et les voiliers des hanses- n'auraient pas repeché la carcasse ivre d'eau-- libre fumant monté de brumes violettes- moi qui trouais le ciel rougeoyant comme un mur- qui porte confiture exquise aux bons poetes- des lichens de soleil et des morves d'azur-- qui courais taché de lunules électriques- planche folle escorté des hippocampes noirs- quand les juillets faisaient crouler a coups de triques- les cieux ultramarins aux ardents entonnoirs-- moi qui tremblais sentant geindre a cinquante lieues- le rut des béhémots et les maelstroms épais- fileur éternel des immobilités bleues- je regrette l'europe aux anciens parapets-- j'ai vu des archipels sidéraux et des îles- dont les cieux délirants sont ouverts au vogueur- - est-ce en ces nuits sans fond que tu dors et t'exiles- million d'oiseaux d'or ô future vigueur --- mais vrai j'ai trop pleuré les aubes sont navrantes- toute lune est atroce et tout soleil amer- l'âcre amour m'a gonflé de torpeurs enivrantes- ô que ma quille éclate ô que j'aille a la mer-- si je désire une eau d'europe c'est la flache- noire et froide ou vers le crépuscule embaumé- un enfant accroupi plein de tristesses lâche- un bateau frele comme un papillon de mai-- je ne puis plus baigné de vos langueurs ô lames- enlever leur sillage aux porteurs de cotons- ni traverser l'orgueil des drapeaux et des flammes- ni nager sous les yeux horribles des pontons- </text>-</lipsum>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Assets/Lipsums/lebateauivre.xml b/src/app/dev/DevToys.Tools/Assets/Lipsums/lebateauivre.xmldeleted file mode 100644index 35a0c4c3f..000000000--- a/src/app/dev/DevToys.Tools/Assets/Lipsums/lebateauivre.xml+++ /dev/null@@ -1,133 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>--<lipsum>- <copyright>This text is under public domain</copyright>- <title>Le Bateau Ivre</title>- <author>Arthur Rimbaud</author>- <text>- comme je descendais des fleuves impassibles- je ne me sentis plus guidé par les haleurs- des peaux-rouges criards les avaient pris pour cibles- les ayant cloués nus aux poteaux de couleurs-- j'étais insoucieux de tous les équipages- porteur de blés flamands ou de cotons anglais- quand avec mes haleurs ont fini ces tapages- les fleuves m'ont laissé descendre ou je voulais-- dans les clapotements furieux des marées- moi l'autre hiver plus sourd que les cerveaux d'enfants- je courus et les péninsules démarrées- n'ont pas subi tohu-bohus plus triomphants-- la tempete a béni mes éveils maritimes- plus léger qu'un bouchon j'ai dansé sur les flots- qu'on appelle rouleurs éternels de victimes- dix nuits sans regretter l'oeil niais des falots-- plus douce qu'aux enfants la chair des pommes sures- l'eau verte pénétra ma coque de sapin- et des taches de vins bleus et des vomissures- me lava dispersant gouvernail et grappin-- et des lors je me suis baigné dans le poeme- de la mer infusé d'astres et lactescent- dévorant les azurs verts ou flottaison bleme- et ravie un noyé pensif parfois descend-- ou teignant tout a coup les bleuités délires- et rythmes lents sous les rutilements du jour- plus fortes que l'alcool plus vastes que nos lyres- fermentent les rousseurs ameres de l'amour-- je sais les cieux crevant en éclairs et les trombes- et les ressacs et les courants je sais le soir- l'aube exaltée ainsi qu'un peuple de colombes- et j'ai vu quelque fois ce que l'homme a cru voir-- j'ai vu le soleil bas taché d'horreurs mystiques- illuminant de longs figements violets- pareils a des acteurs de drames tres-antiques- les flots roulant au loin leurs frissons de volets-- j'ai revé la nuit verte aux neiges éblouies- baiser montant aux yeux des mers avec lenteurs- la circulation des seves inouies- et l'éveil jaune et bleu des phosphores chanteurs-- j'ai suivi des mois pleins pareille aux vacheries- hystériques la houle a l'assaut des récifs- sans songer que les pieds lumineux des maries- pussent forcer le mufle aux océans poussifs-- j'ai heurté savez-vous d'incroyables florides- melant aux fleurs des yeux de pantheres a peaux- d'hommes des arcs-en-ciel tendus comme des brides- sous l'horizon des mers a de glauques troupeaux-- j'ai vu fermenter les marais énormes nasses- ou pourrit dans les joncs tout un léviathan- des écroulement d'eau au milieu des bonaces- et les lointains vers les gouffres cataractant-- glaciers soleils d'argent flots nacreux cieux de braises- échouages hideux au fond des golfes bruns- ou les serpents géants dévorés de punaises- choient des arbres tordus avec de noirs parfums-- j'aurais voulu montrer aux enfants ces dorades- du flot bleu ces poissons d'or ces poissons chantants- - des écumes de fleurs ont bercé mes dérades- et d'ineffables vents m'ont ailé par instants-- parfois martyr lassé des pôles et des zones- la mer dont le sanglot faisait mon roulis doux- montait vers moi ses fleurs d'ombres aux ventouses jaunes- et je restais ainsi qu'une femme a genoux-- presque île balottant sur mes bords les querelles- et les fientes d'oiseaux clabaudeurs aux yeux blonds- et je voguais lorsqu'a travers mes liens freles- des noyés descendaient dormir a reculons-- or moi bateau perdu sous les cheveux des anses- jeté par l'ouragan dans l'éther sans oiseau- moi dont les monitors et les voiliers des hanses- n'auraient pas repeché la carcasse ivre d'eau-- libre fumant monté de brumes violettes- moi qui trouais le ciel rougeoyant comme un mur- qui porte confiture exquise aux bons poetes- des lichens de soleil et des morves d'azur-- qui courais taché de lunules électriques- planche folle escorté des hippocampes noirs- quand les juillets faisaient crouler a coups de triques- les cieux ultramarins aux ardents entonnoirs-- moi qui tremblais sentant geindre a cinquante lieues- le rut des béhémots et les maelstroms épais- fileur éternel des immobilités bleues- je regrette l'europe aux anciens parapets-- j'ai vu des archipels sidéraux et des îles- dont les cieux délirants sont ouverts au vogueur- - est-ce en ces nuits sans fond que tu dors et t'exiles- million d'oiseaux d'or ô future vigueur --- mais vrai j'ai trop pleuré les aubes sont navrantes- toute lune est atroce et tout soleil amer- l'âcre amour m'a gonflé de torpeurs enivrantes- ô que ma quille éclate ô que j'aille a la mer-- si je désire une eau d'europe c'est la flache- noire et froide ou vers le crépuscule embaumé- un enfant accroupi plein de tristesses lâche- un bateau frele comme un papillon de mai-- je ne puis plus baigné de vos langueurs ô lames- enlever leur sillage aux porteurs de cotons- ni traverser l'orgueil des drapeaux et des flammes- ni nager sous les yeux horribles des pontons- </text>-</lipsum>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Assets/Lipsums/lemasque.xml b/src/app/dev/DevToys.Tools/Assets/Lipsums/lemasque.xmldeleted file mode 100644index 45748b5a9..000000000--- a/src/app/dev/DevToys.Tools/Assets/Lipsums/lemasque.xml+++ /dev/null@@ -1,50 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>--<lipsum>- <copyright>This text is under public domain</copyright>- <title>Le Masque</title>- <author>Charles Baudelaire</author>- <text>- contemplons ce trésor de grâces florentines- dans l'ondulation de ce corps musculeux- l'elégance et la force abondent soeurs divines- cette femme morceau vraiment miraculeux- divinement robuste adorablement mince- est faite pour trôner sur des lits somptueux- et charmer les loisirs d'un pontife ou d'un prince-- aussi vois ce souris fin et voluptueux- ou la fatuité promene son extase- ce long regard sournois langoureux et moqueur- ce visage mignard tout encadré de gaze- dont chaque trait nous dit avec un air vainqueur- «la volupté m'appelle et l'amour me couronne»- a cet etre doué de tant de majesté- vois quel charme excitant la gentillesse donne- approchons et tournons autour de sa beauté-- ô blaspheme de l'art ô surprise fatale- la femme au corps divin promettant le bonheur- par le haut se termine en monstre bicéphale-- mais non ce n'est qu'un masque un décor suborneur- ce visage éclairé d'une exquise grimace- et regarde voici crispée atrocement- la véritable tete et la sincere face- renversée a l'abri de la face qui ment- pauvre grande beauté le magnifique fleuve- de tes pleurs aboutit dans mon coeur soucieux- ton mensonge m'enivre et mon âme s'abreuve- aux flots que la douleur fait jaillir de tes yeux-- mais pourquoi pleure-t-elle elle beauté parfaite- qui mettrait a ses pieds le genre humain vaincu- quel mal mystérieux ronge son flanc d'athlete-- elle pleure insensé parce qu'elle a vécu- et parce qu'elle vit mais ce qu'elle déplore- surtout ce qui la fait frémir jusqu'aux genoux- c'est que demain hélas il faudra vivre encore- demain apres-demain et toujours comme nous- </text>-</lipsum>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Assets/Lipsums/lipsum.dtd b/src/app/dev/DevToys.Tools/Assets/Lipsums/lipsum.dtddeleted file mode 100644index 196cb1d39..000000000--- a/src/app/dev/DevToys.Tools/Assets/Lipsums/lipsum.dtd+++ /dev/null@@ -1,7 +0,0 @@-<!-- This is the valid DTD of a lipsum file used by Lipsum - the text generator -->-<!ELEMENT lipsum (copyright, title, author, text)>-- <!ELEMENT copyright (#PCDATA)>- <!ELEMENT title (#PCDATA)>- <!ELEMENT author (#PCDATA)>- <!ELEMENT text (#PCDATA)>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Assets/Lipsums/loremipsum.xml b/src/app/dev/DevToys.Tools/Assets/Lipsums/loremipsum.xmldeleted file mode 100644index e9e67c8ce..000000000--- a/src/app/dev/DevToys.Tools/Assets/Lipsums/loremipsum.xml+++ /dev/null@@ -1,16 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>--<lipsum>- <copyright>This text is under public domain</copyright>- <title>Lorem ipsum</title>- <author>Cicero</author>- <text>- lorem ipsum dolor sit amet consetetur sadipscing elitr sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat sed diam voluptua at vero eos et accusam et justo duo dolores et ea rebum stet clita kasd gubergren no sea takimata sanctus est lorem ipsum dolor sit amet lorem ipsum dolor sit amet consetetur sadipscing elitr sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat sed diam voluptua at vero eos et accusam et justo duo dolores et ea rebum stet clita kasd gubergren no sea takimata sanctus est lorem ipsum dolor sit amet lorem ipsum dolor sit amet consetetur sadipscing elitr sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat sed diam voluptua at vero eos et accusam et justo duo dolores et ea rebum stet clita kasd gubergren no sea takimata sanctus est lorem ipsum dolor sit amet- duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi lorem ipsum dolor sit amet consectetuer adipiscing elit sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat- ut wisi enim ad minim veniam quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi- nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum lorem ipsum dolor sit amet consectetuer adipiscing elit sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat ut wisi enim ad minim veniam quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat- duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat vel illum dolore eu feugiat nulla facilisis- at vero eos et accusam et justo duo dolores et ea rebum stet clita kasd gubergren no sea takimata sanctus est lorem ipsum dolor sit amet lorem ipsum dolor sit amet consetetur sadipscing elitr sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat sed diam voluptua at vero eos et accusam et justo duo dolores et ea rebum stet clita kasd gubergren no sea takimata sanctus est lorem ipsum dolor sit amet lorem ipsum dolor sit amet consetetur sadipscing elitr at accusam aliquyam diam diam dolore dolores duo eirmod eos erat et nonumy sed tempor et et invidunt justo labore stet clita ea et gubergren kasd magna no rebum sanctus sea sed takimata ut vero voluptua est lorem ipsum dolor sit amet lorem ipsum dolor sit amet consetetur sadipscing elitr sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat- consetetur sadipscing elitr sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat sed diam voluptua at vero eos et accusam et justo duo dolores et ea rebum stet clita kasd gubergren no sea takimata sanctus est lorem ipsum dolor sit amet lorem ipsum dolor sit amet consetetur sadipscing elitr sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat sed diam voluptua at vero eos et accusam et justo duo dolores et ea rebum stet clita kasd gubergren no sea takimata sanctus est lorem ipsum dolor sit amet lorem ipsum dolor sit amet consetetur sadipscing elitr sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat sed diam voluptua at vero eos et accusam et justo duo dolores et ea rebum stet clita kasd gubergren no sea takimata sanctus est lorem ipsum dolor sit amet- </text>-</lipsum>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Assets/Lipsums/nagyonfaj.xml b/src/app/dev/DevToys.Tools/Assets/Lipsums/nagyonfaj.xmldeleted file mode 100644index 5da7e2135..000000000--- a/src/app/dev/DevToys.Tools/Assets/Lipsums/nagyonfaj.xml+++ /dev/null@@ -1,120 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>--<lipsum>- <copyright>This text is under public domain</copyright>- <title>Nagyon fáj</title>- <author>József Attila</author>- <text>- kivül belől- leselkedő halál elől- mint lukba megriadt egérke-- amíg hevülsz- az asszonyhoz úgy menekülsz- hogy óvjon karja öle térde-- nemcsak a lágy- meleg öl csal nemcsak a vágy- de odataszít a muszáj is-- ezért ölel- minden ami asszonyra lel- míg el nem fehérül a száj is-- kettős teher- s kettős kincs hogy szeretni kell- ki szeret s párra nem találhat-- oly hontalan- mint amilyen gyámoltalan- a szükségét végző vadállat-- nincsen egyéb- menedékünk a kés hegyét- bár anyádnak szegezd te bátor-- és lásd akadt- nő ki érti e szavakat- de mégis ellökött magától-- nincsen helyem- így élők közt zúg a fejem- gondom s fájdalmam kicifrázva-- mint a gyerek- kezében a csörgő csereg- ha magára hagyottan rázza-- mit kellene- tenni érte és ellene- nem szégyellem ha kitalálom-- hisz kitaszít- a világ így is olyat akit- kábít a nap rettent az álom-- a kultúra- úgy hull le rólam mint ruha- másról a boldog szerelemben-- de az hol áll- hogy nézze mint dobál halál- s még egyedül kelljen szenvednem-- a csecsemő- is szenvedi ha szül a nő- páros kínt enyhíthet alázat-- de énnekem- pénzt hoz fájdalmas énekem- s hozzám szegődik a gyalázat-- segítsetek- ti kisfiúk a szemetek- pattanjon meg ott ő ahol jár-- ártatlanok- csizmák alatt sikongjatok- és mondjátok neki¨nagyon fáj-- ti hű ebek- kerék alá kerüljetek- s ugassátok neki nagyon fáj-- nők terhetek- viselők elvetéljetek- és sírjátok neki nagyon fáj-- ép emberek- bukjatok öszetörjetek- s motyogjatok neki nagyon fáj-- ti férfiak- egymást megtépve nő miatt- ne hallgassátok el nagyon fáj-- lovak bikák- kiket hogy húzzatok igát- herélnek ríjjátok nagyon fáj-- néma halak- horgot kapjatok jég alatt- és tátogjatok rá nagyon fáj-- elevenek- minden mi kíntól megremeg- égjen hol laktok kert vadon táj-- s ágya körül- üszkösen ha elszenderül- vakogjatok velem nagyon fáj-- hallja míg él- azt tagadta meg amit ér- elvonta puszta kénye végett-- kivül belől- menekülő élő elől- a legutolsó menedéket- </text>-</lipsum>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Assets/Lipsums/omagyar.xml b/src/app/dev/DevToys.Tools/Assets/Lipsums/omagyar.xmldeleted file mode 100644index 7669eff5f..000000000--- a/src/app/dev/DevToys.Tools/Assets/Lipsums/omagyar.xml+++ /dev/null@@ -1,10 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>--<lipsum>- <copyright>This text is under public domain</copyright>- <title>Ómagyar-Mária siralom</title>- <author>Ismeretlen</author>- <text>- volek syrolm thudothlon syrolmol sepedyk buol ozuk epedek walasth vylagumtul sydou fyodumtul ezes urumemtuul o en eses urodum eggen yg fyodum syrou aniath thekunched buabeleul kyniuhhad scemem kunuel arad en iunhum buol farad the werud hullothya en iunhum olelothya vylag uilaga viragnac uiraga keseruen kynzathul uos scegegkel werethul vh nequem en fyon ezes mezuul scegenul scepsegud wirud hioll wyzeul syrolmom fuhazatum therthetyk kyul en iumhumnok bel bua qui sumha nym kyul hyul wegh halal engumet eggedum illen maraggun urodum kyth wylag felleyn o ygoz symeonnok bezzeg scouuo ere en erzem ez buthuruth kyt niha egyre tuled ualmun de num ualallal hul yg kynzassal fyom halallal sydou myth thez turuentelen fyom merth hol byuntelen fugwa huztuzwa wklelue kethwe ulud keguggethuk fyomnok ne leg kegulm mogomnok owog halal kynaal anyath ezes fyaal egembelu ullyetuk- </text>-</lipsum>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Assets/Lipsums/robinsonokruso.xml b/src/app/dev/DevToys.Tools/Assets/Lipsums/robinsonokruso.xmldeleted file mode 100644index f0bc3076b..000000000--- a/src/app/dev/DevToys.Tools/Assets/Lipsums/robinsonokruso.xml+++ /dev/null@@ -1,317 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>--<lipsum>- <copyright>This text is under public domain</copyright>- <title>Robinsono Kruso (Esperanto)</title>- <author>Daniel Defoe</author>- <text>- mi naskigxis en jorko anglujo je marto kiu estas la- sesjarrego de la regxo karolo la unua infane mi sentadis grandan- deziron por pasigi mian vivon sur la maro kaj pliagxante la deziro- plifortigxis gxis fine mi forlasis mian lernejon kaj hejmon kaj- piede mi trovis mian vojon al hull kie mi baldaux trovis okupadon sur- sxipo-- post kiam ni velveturis kelke da tagoj okazis ventego kaj kvinanokte- la sxipo enfendigxis cxiuj al la pumpiloj rapidis la sxipon ni sentis- gxemi en cxiuj siaj tabuloj kaj gxian trabajxon ektremi de la antauxa gxis- la posta parto kaj baldaux klarigxis ke ne estas ia espero por gxi kaj- ke cxio kion ni povas fari estas savi niajn vivojn-- unue ni pafadis pafilegojn por venigi helpon kaj post kelke da- tempo sxipo kusxante ne malproksime alsendis boaton por helpi nin sed- la maro estis tro maltrankvila por gxi restadi sxipflanke tial ni- eljxetis sxnuregon kiun la boatanoj ekkaptis kaj firme fiksis kaj- tiamaniere ni cxiuj enboatigxis-- tamen vanigxis en tia maltrankvila maro por peni albordigxi la sxipon- kiu alsendis la virojn aux aluzi la remilojn de la boato kaj ni ne- povis ion fari krom gxin lasi peligxi teron-- duonhore nia sxipo trafis rifon kaj subakvigxis kaj gxin ni ne vidis- plu tre malrapide ni alproksimigxis teron kiun iafoje ni vidis kiam- ajn la boato levigxis sur la supro de ia alta ondo kaj tie ni vidis- homojn kurante amase tien kaj reen havante unu celon savi nin-- fine gxojege ni surterigxis kie bonsxance ni renkontis amikojn kiuj- donis al ni helpon por reveturi al hull kaj se tiam mi havus la- bonan sencon por iri hejmon estus pli bone por mi-- la viro kies sxipo subakvigxis diris kun grava mieno junulo ne iru- plu surmaron tiu ne estas la vivmaniero por vi kial do sinjoro- vi mem iros plu surmaron tiu estas alia afero mi estas elnutrita- por la maro sed vi ne estas vi venis sur mian sxipon por eltrovi la- staton de vivo surmara kaj vi povas diveni tion kio okazos al vi se- vi ne reiros hejmon dio ne benos vin kaj eble vi kauxzis tiun-cxi- tutan malbonon al ni-- mi ne parolis alian vorton al li kiun vojon li iris mi nek scias- nek deziris sciigxi cxar mi estis ofendita pro tiu-cxi malgxentila- parolado mi multe pensis cxu iri hejmon aux cxu iradi surmaron honto- detenis min pri iri hejmon kaj mi ne povis decidi la vivkuron kiun- mi estis ironta-- kiel estis mia sorto travive cxiam elekti la plej malbonon tiel same- mi nun faris mi havis oron en mia monujo kaj bonan vestajxon sur mia- korpo sed surmaron mi ree iris-- sed nun mi havis pli malbonan sxancon ol iam cxar kiam ni estis tre- malproksime enmaro kelke da turkoj en sxipeto plencxase alproksimigxis- al ni ni levis tiom da veloj kiom niaj velstangoj povis elporti por- ke ni forkuru de ili tamen malgraux tio ni vidis ke niaj malamikoj- pli kaj pli alproksimigxis kaj certigxis ke baldaux ili atingos nian- sxipon-- fine ili atingis nin sed ni direktis niajn pafilegojn sur ilin kio- kauxzis portempe ke ili deflanku sian vojon sed ili dauxrigis pafadon- sur ni tiel longe kiel ili estis en pafspaco proksimigxante la duan- fojon kelkaj viroj atingis la ferdekon de nia sxipo kaj ektrancxis la- velojn kaj ekfaris cxiuspecajn difektajxojn tial post kiam dek el- niaj sxipanoj kusxas mortitaj kaj la plimulto el la ceteraj havas- vundojn ni kapitulacis-- la cxefo de la turkoj prenis min kiel sian rabajxon al haveno okupita- de mauxroj li ne agis al mi tiel malbone kiel mi lin unue jugxis sed- li min laborigis kun la ceteraj de siaj sklavoj tio estis sxangxo en- mia vivo kiun mi neniam antauxvidis ho ve kiom mia koro malgxojis- pensante pri tiuj kiujn mi lasis hejme al kiuj mi ne montris tiom da- komplezemo kiom diri adiauxi kiam mi iris surmaron aux sciigi tion- kion mi intencas fari-- tamen cxio kion mi travivis tiam estas nur antauxgusto de la penadoj- kaj zorgoj kiujn de tiam estis mia sorto suferi-- unue mi pensis ke la turko kunprenos min kun si kiam li ree iros- surmaron kaj ke mi iel povos liberigxi sed la espero nelonge dauxris- cxar tiatempe li lasis min surtere por prizorgi liajn rikoltojn- tiamaniere mi vivis du jarojn tamen la turko konante kaj vidante min- plu min pli kaj pli liberigis li unufoje aux dufoje cxiusemajne- veturis en sia boato por kapti iajn platfisxojn kaj iafoje li- kunprenis min kaj knabon kun si cxar ni estas rapidaj cxe tia sporto- kaj tial li pli kaj pli sxatis min-- unu tagon la turko elsendis min viron kaj knabon boate por kapti- kelke da fisxoj surmare okazas tia densa nebulo ke dekduhore ni ne- povas vidi la teron kvankam ni ne estas pli ol duonmejlon 00- metrojn de la terbordo kaj morgauxtage kiam la suno levigxis nia- boato estas enmaro almenaux dek mejlojn kilometrojn de la- terbordo la vento vigle blovis kaj ni cxiuj tre bezonis nutrajxon sed- fine per la helpo de remiloj kaj veloj ni sendangxere reatingis la- terbordon-- kiam la turko sciigxis kiamaniere ni vojperdis li diris ke de nun- kiam li velveturos li prenos boaton kiu enhavos cxion kion ni- bezonus se ni longatempe estus detenataj surmare tial li farigis- grandan kajuton en la longboato de sia sxipo kiel ankaux cxambron por ni- sklavoj unu tagon li min sendis por ke mi ordigu la boaton pro tio- ke li havas du amikojn kiuj intencas veturi kun li por fisxkapti sed- kiam la tempo alvenis ili ne veturas tial li sendis min viron kaj- knabon -- kies nomo estas zuro -- por kapti kelke da fisxoj por la- gastoj kiuj estas vespermangxontaj kun li-- subite eniris en mian kapon la ideo ke nun estas bona okazo boate- forkuri kaj liberigxi tial mi tuj prenis tiom da nutrajxo kiom mi- povas havigi kaj mi diris al la viro ke estus tro malrespekte- mangxante la panon metitan en la boaton por la turko li diris ke li- pensas tiel same tial li alportis sakon da rizo kaj kelke da ruskoj- kukoj-- dum la viro estis surtere mi provizis iom da vino pecegon da vakso- segilon hakilon fosilon iom da sxnurego kaj cxiuspecajn objektojn- kiuj eble estos utilaj al ni mi sciis kie trovigxas la vinkesto de la- turko kaj mi gxin metis surboaton dum la viro estas surtere per alia- ruzo mi havigis cxion kion mi bezonis mi diris al la knabo la- pafiloj de la turko estas en la boato sed ne trovigxas ia pafajxo cxu- vi pensas ke vi povas havigi iom da gxi vi scias kie gxi estas- konservata kaj eble ni volos pafi birdon aux du li do alportis kesto- kaj saketon kiuj enhavas cxion kion ni eble bezonas por la pafiloj- tiujn-cxi mi metis surboaton kaj poste velveturis por fisxkapti-- la vento blovis de la nordo aux nordokcidento tia vento estis malbona- por mi cxar se gxi estus de la sudo mi estus povinta velveturi al la- terbordo de hispanujo tamen de kiu ajn loko la vento blovos mi- estis decidinta forkuri kaj lasi la ceterajn al ilia sorto mi do- mallevis miajn hokfadenojn kvazaux fisxkapti sed mi zorgis ke mi havu- malbonan sukceson kaj kiam la fisxoj mordis mi ilin ne eltiris cxar- mi deziris ke la mauxro ilin ne vidu mi diris al li tiu-cxi loko- estas nebona ni ne kaptos fisxojn tie-cxi ni devas iom antauxen iri- nu la mauxro pensis ke tion fari ne estos malbone li levis la- velojn kaj cxar la direktilo estis en miaj manoj mi elsendis la- boaton unu mejlon aux plu enmaron kaj poste gxin haltigis kvazaux mi- intencas fisxkapti-- nun mi pripensis tiu-cxi estas mia okazo liberigxi tial mi transdonis- la direktilon al la knabo kaj tiam ekprenis la mauxron cxirkaux la- talio kaj eljxetis lin el la boato-- malsupren li falis sed baldaux reaperis por ke li povis nagxi kvazaux- anaso li diris ke li volonte irus cxirkaux la mondo kun mi se mi- enprenus lin-- iom timante ke li surrampos la boatflankon kaj reenigxos perforte mi- direktis mian pafilon sur lin kaj diris vi facile povas nagxi- alteron se vi tion deziras tial rapidigxu tien plie se vi reen- alproksimigxos la boaton vi ricevos kuglon tra la kapo cxar mi de nun- intencas esti libera viro-- tiam li eknagxis kaj sendube sendangxere atingis la terbordon cxar la- maro estis tre trankvila-- unue mi intencis kunpreni la mauxron kun mi kaj nagxigi zuron alteron- sed la mauxro ne estis viro pri kiu mi povis konfidi-- post kiam li forigxis mi diris al zuro se vi jxuros ke vi estos- fidela al mi vi iam farigxos grava viro se vi ne jxuros mi certe- ankaux vin eljxetos el la boato-- la knabo tiel dolcxe ridetis kiam li jxuris resti fidela al mi ke mi- lin ne povis dubi en mia koro-- dum ankoraux ni povis vidi la mauxron survoje alteren ni antauxen iris- enmaron por ke li kaj tiuj kiuj nin vidis de la terbordo kredu ke- ni iros al la influejo de la markolo cxar neniu velveturis al la suda- marbordo cxar tie logxas gento da homoj kiuj laux sciigoj mortigas kaj- mangxas siajn malamikojn-- tiam mi direktis mian veturadon oriente por ke ni lauxlongiru la- marbordon kaj havante favoron venton kaj trankvilan maron ni- morgauxtagmeze estis malapud kaj preter la povo de la turko-- ankoraux mi timis ke mi estus kaptota de la mauxroj tial mi ne volis- iri surteron tage duonlume ni direktis nian boaton alteren kaj- atingis la enfluejon riveretan de kiu mi pensis ni povos nagxi- surteron kaj tiam rigardi la cxirkauxajxojn sed kiam malheligxis la- lumo ni auxdis strangajn sonojn bojojn kriegojn gruntojn- blekadojn la malfelicxa knabo diris ke li ne kuragxas iri surteron- antaux la tagigxo nu mi diris tiuokaze ni atendu sed tage- povas vidi nin la homoj kiuj eble nin pli malhelpos ol sovagxaj- bestoj tiam ni pafilos ilin ridante diris zuro kaj forkurigu- ilin-- mi gxojis vidi ke la knabo montras tiom da gajeco kaj mi donis al li- iom da pano kaj rizo tiunokte ni silente ripozis sed ne longe- dormis cxar post kelke da horoj iaj grandegaj bestoj malsuprenvenis- al la maro por sin bani la malfelicxa knabo ektremis de kapo al- piedoj pro la vidajxo unu el tiuj bestoj alproksimigxis nian boaton- kaj kvankam estis tro mallume por gxin bone vidi ni auxdis gxin blovi- kaj sciis pro gxia bruego ke gxi certe estas granda fine la bruto- tiom alproksimigxis la boaton kiom la longeco de du remiloj tial mi- pafis sur gxin kaj gxi nagxis alteren-- la blekegoj kaj kriegoj kiujn faris bestoj kaj birdoj pro la bruo de- mia pafilo sxajne montris ke ni faris malbonan elekton por surterejo- sed vole ne vole ni devis iri surtere por sercxi fresxan fonton por- ke ni povu plenigi niajn barelojn zuro diris ke li eltrovus cxu la- fontaj akvoj tauxgas por trinki se mi permesus al li preni unu el la- botelegoj kaj ke li gxin reportos plenigitan se la akvo estas bona- kial vi volas iri mi diris kial mi ne estas ironta vi povas- resti en la boato kontrauxe zuro diris se la sovagxuloj venos ili- min mangxu sed vi forkuru mi devis ami la junulon pro la afabla- parolado nu mi diris ni ambaux iros kaj se la sovagxuloj venos- ni ilin mortigu ja ili ne mangxos aux vin aux min-- mi donis al zuro iom da rumo el la kesto de la turko por reforti lin- kaj ni iris surteron la knabo ekiris kun sia pafilo mejlon de la- loko kie ni surteriris kaj li revenis kun leporo kiun li mortpafis- kaj kiun ni gxoje kuiris kaj mangxis laux la bona novajxo kiun li- raportis li eltrovis fonton kaj ne vidis sovagxulojn-- mi divenis ke la promontoro de la verdaj insuloj ne estas- malproksime cxar mi vidis la supron de la granda pinto kiun kiel mi- sciis estas apud ili mia sola espero estis ke lauxlongirante la- terbordon ni trovos sxipon kiu ensxipigos nin kaj tiam kaj ne antaux- tiam mi sentos kvazaux libera viro unuvorte mi konfidis mian sorton- al la sxanco aux renkonti ian sxipon aux morti-- surteron ni ekvidis iujn homojn kiuj staras kaj rigardas nin ili- estis nigraj kaj ne portis vestajxon mi estus irinta surteron al ili- sed zuro -- kiu sciis plej bone -- diris ne vi iru ne vi iru tial- mi direktis la boaton lauxteron por ke mi povu paroli kun ili kaj ili- longaspace iradis laux ni mi ekvidis ke unu havas lancon en mano-- mi faris signojn ke ili alportu iom da nutrajxo al mi kaj ili- siaparte faris signojn ke mi haltu mian boaton tial mi demetis la- supran parton de mia velo kaj haltis tiam du el ili ekforkuris kaj- duonhore revenis kun iom da sekigxita viando kaj ia greno kiu kreskas- en tiu parto de la mondo tion-cxi ni deziregis sed ne sciis kiel- havigi gxin cxar ni ne kuragxis iri surteron al ili nek ili kuragxis- alproksimigxi al ni-- fine ili eltrovis peron sendangxeran por ni cxiuj alportante la- nutrajxon al la marbordo ili gxin demetis kaj tre fortirigis si mem dum- ni gxin prenis ni faris signojn por montri nian dankon ne havante ion- alian kion ni povas doni al ili sed bonsxance ni baldaux kaptis- grandan donacon por ili cxar du sovagxaj bestoj de la sama speco pri- kiu mi jam priparolis venis plencxase de la montetoj al la maro-- ili nagxis kvazaux ili venis por sportigi cxiuj forkuris de ili krom- tiu kiu portas la lancon unu el tiuj bestoj alproksimigxis nian- boaton tial mi gxin atendis kun mia pafilo kaj tuj kiam gxi estis en- pafspaco mi gxin pafis tra la kapo dufoje gxi subakvigxis kaj dufoje gxi- suprenlevigxis kaj poste gxi nagxis alteren kaj falis senviva la viroj- tiom timis pro la pafilbruo kiom ili antauxe timis je la vidajxo de la- bestoj sed kiam mi faris signojn por ke ili venu al la marbordo ili- tuj venis-- ili rapidis al sia rabajxo kaj tordante cxirkaux gxi sxnuregon ili gxin- sendangxere eltiris surteron-- ni nun lasis niajn sovagxulojn kaj iradis dekdu tagojn plu la terbordo- antaux ni etendis sin kvar aux kvin mejlojn aux kilometrojn- bekforme kaj ni devis veturi iom de la terbordo por atingi tiun- terpinton tiel ke ni portempe ne vidis teron-- mi konfidis la direktilon al zuro kaj sidigxis por pripensi tion kion- estos plej bone nun fari kiam subite mi auxdis ke la knabo krias- sxipon kun velo sxipon kun velo li ne montris multe da gxojo je la- vidajxo opiniante ke la sxipo venis por repreni lin sed mi bone- scias laux la sxajno ke gxi ne estas iu el la sxipoj de la turko-- mi levis kiel eble plej multe da veloj por renkonti la sxipon gxiavoje- kaj ordonis al zuro ke li ekpafu pafilon cxar mi esperis ke se tiuj- kiuj estas sur la ferdeko ne povus auxdi la sonon ili vidus la- fumigadon ili ja gxin vidis kaj tuj demetis siajn velojn por ke ni- povu atingi ilin kaj trihore ni estis cxe la sxipflanko la viroj- parolis kun ni per la franca lingvo sed ni ne povis kompreni tion- kion ili diras fine skoto sursxipe diris per mia lingvo kiu vi- estas de kien vi venas mi diris al li iomvorte kiel mi liberigxis- de la mauxroj-- tiam la sxipestro invitis min veni sxipbordon kaj ensxipis min zuron- kaj cxiujn miajn posedajxojn mi diris al li ke li havu cxion kion mi- havas sed li respondis vi estas rericevonta viajn posedajxojn post- kiam ni atingos teron cxar mi por vi nur faris tion kion por mi vi- farus samstate-- li pagis al mi multan monon por mia boato kaj diris ke mi ricevos- egalan monon por zuro se mi lin fordonus sed mi diris al li ke- liberigxinte kun helpo de la knabo mi lin ne volas vendi li diris ke- estas juste kaj prave por mi tiel senti sed se mi decidus fordoni- zuron li estus liberigota dujare tial cxar la sklavo deziris iri mi- nenial diris ne trisemajne mi alvenis al cxiuj sanktuloj golfeto kaj- nun mi estis liberulo-- mi ricevis multan monon por cxiujn miaj posedajxoj kaj kun gxi mi iris- surteron sed mi tute ne sciis kion nun fari fine mi renkontis- viron kies stato estas laux la mia kaj ni ambaux akiris pecon da tero- por gxin prilabori mia farmilaro laux la lia estis malgranda sed ni- produktigis la farmojn suficxe por subteni nin sed ne plu ni bezonis- helpon kaj nun mi eksentis ke mi eraris ellasante la knabon-- mi tute ne sxatis tiun manieron de vivo kion mi pensis cxu mi venis- tian longan vojon por fari tion kion mi lauxbone povus fari hejme kaj- kun miaj parencoj cxirkaux mi kaj pligrandigxis mia malgxojo cxar la- bonamiko kiu min alsxipis tien-cxi intencas nune lasi tiun-cxi- terbordon-- kiam mi estis knabo kaj ekiris surmaron mi metis en la manojn de mia- onklino iom da mono pri kiu mia bonamiko diris ke mi bone farus se- mi gxin elspezus pro mia bieno tial post kiam li revenis hejmon li- alsendis iom da gxi kontante kaj la restajxon kiel tukoj sxtofoj- lanajxoj kaj similajxoj kiujn li acxetis mia onklino tiam metis en- liajn manojn iom da livroj kiel donaco al li por montri sian- dankecon pro cxio kion li faris por mi kaj per tiu mono li afable- acxetis sklavon por mi intertempe mi jam acxetis sklavon tial mi nun- havas du kaj cxio prosperis dum la sekvanta jaro- </text>-</lipsum>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Assets/Lipsums/theraven.xml b/src/app/dev/DevToys.Tools/Assets/Lipsums/theraven.xmldeleted file mode 100644index fc588c357..000000000--- a/src/app/dev/DevToys.Tools/Assets/Lipsums/theraven.xml+++ /dev/null@@ -1,134 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>--<lipsum>- <copyright>This text is under public domain</copyright>- <title>The Raven</title>- <author>Edgar Allan Poe</author>- <text>- once upon a midnight dreary while i pondered weak and weary- over many a quaint and curious volume of forgotten lore- while i nodded nearly napping suddenly there came a tapping- as of some one gently rapping rapping at my chamber door- tis some visiter i muttered tapping at my chamber door- only this and nothing more-- ah distinctly i remember it was in the bleak december- and each separate dying ember wrought its ghost upon the floor- eagerly i wished the morrow vainly i had sought to borrow- from my books surcease of sorrowsorrow for the lost lenore- for the rare and radiant maiden whom the angels name lenore- nameless here for evermore-- and the silken sad uncertain rustling of each purple curtain- thrilled mefilled me with fantastic terrors never felt before- so that now to still the beating of my heart i stood repeating- tis some visiter entreating entrance at my chamber door- some late visiter entreating entrance at my chamber door- this it is and nothing more-- presently my soul grew stronger hesitating then no longer- sir said i or madam truly your forgiveness i implore- but the fact is i was napping and so gently you came rapping- and so faintly you came tapping tapping at my chamber door- that i scarce was sure i heard youhere i opened wide the door- darkness there and nothing more-- deep into that darkness peering long i stood there wondering fearing- doubting dreaming dreams no mortals ever dared to dream before- but the silence was unbroken and the stillness gave no token- and the only word there spoken was the whispered word lenore- this i whispered and an echo murmured back the word lenore- merely this and nothing more-- back into the chamber turning all my soul within me burning- soon again i heard a tapping something louder than before- surely said i surely that is something at my window lattice- let me see then what thereat is and this mystery explore- let my heart be still a moment and this mystery explore- tis the wind and nothing more-- open here i flung the shutter when with many a flirt and flutter- in there stepped a stately raven of the saintly days of yore- not the least obeisance made he not a minute stopped or stayed he- but with mien of lord or lady perched above my chamber door- perched upon a bust of pallas just above my chamber door- perched and sat and nothing more-- then the ebony bird beguiling my sad fancy into smiling- by the grave and stern decorum of the countenance it wore- though thy crest be shorn and shaven thou i said art sure no craven- ghastly grim and ancient raven wandering from the nightly shore- tell me what thy lordly name is on the nights plutonian shore- quoth the raven nevermore-- much i marvelled this ungainly fowl to hear discourse so plainly- though its answer little meaninglittle relevancy bore- for we cannot help agreeing that no living human being- ever yet was blessed with seeing bird above his chamber door- bird or beast upon the sculptured bust above his chamber door- with such name as nevermore-- but the raven sitting lonely on that placid bust spoke only- that one word as if its soul in that one word he did outpour- nothing farther then he uttered not a feather then he fluttered- till i scarcely more than muttered other friends have flown before- on the morrow he will leave me as my hopes have flown before- then the bird said nevermore-- startled at the stillness broken by reply so aptly spoken- doubtless said i what it utters is its only stock and store- caught from some unhappy master whom unmerciful disaster- followed fast and followed faster till his songs one burden bore- till the dirges of his hope that melancholy burden bore- of nevernevermore-- but the raven still beguiling all my sad soul into smiling- straight i wheeled a cushioned seat in front of bird and bust and door- then upon the velvet sinking i betook myself to linking- fancy unto fancy thinking what this ominous bird of yore- what this grim ungainly ghastly gaunt and ominous bird of yore- meant in croaking nevermore-- this i sat engaged in guessing but no syllable expressing- to the fowl whose fiery eyes now burned into my bosoms core- this and more i sat divining with my head at ease reclining- on the cushions velvet lining that the lamplight gloated oer- but whose velvet violet lining with the lamplight gloating oer- she shall press ah nevermore-- then methought the air grew denser perfumed from an unseen censer- swung by seraphim whose footfalls tinkled on the tufted floor- wretch i cried thy god hath lent theeby these angels he hath sent thee- respiterespite and nepenthe from thy memories of lenore- quaff oh quaff this kind nepenthe and forget this lost lenore- quoth the raven nevermore-- prophet said i thing of evilprophet still if bird or devil- whether tempter sent or whether tempest tossed thee here ashore- desolate yet all undaunted on this desert land enchanted- on this home by horror hauntedtell me truly i implore- is thereis there balm in gileadtell metell me i implore- quoth the raven nevermore-- prophet said i thing of evilprophet still if bird or devil- by that heaven that bends above usby that god we both adore- tell this soul with sorrow laden if within the distant aidenn- it shall clasp a sainted maiden whom the angels name lenore- clasp a rare and radiant maiden whom the angels name lenore- quoth the raven nevermore-- be that our sign of parting bird or fiend i shrieked upstarting- get thee back into the tempest and the nights plutonian shore- leave no black plume as a token of that lie thy soul has spoken- leave my loneliness unbrokenquit the bust above my door- take thy beak from out my heart and take thy form from off my door- quoth the raven nevermore-- and the raven never flitting still is sitting still is sitting- on the pallid bust of pallas just above my chamber door- and his eyes have all the seeming of a demons that is dreaming- and the lamplight oer him streaming throws his shadows on the floor- and my soul from out that shadow that lies floating on the floor- shall be liftednevermore- </text>-</lipsum>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Assets/Lipsums/tierrayluna.xml b/src/app/dev/DevToys.Tools/Assets/Lipsums/tierrayluna.xmldeleted file mode 100644index 9bf2ddff2..000000000--- a/src/app/dev/DevToys.Tools/Assets/Lipsums/tierrayluna.xml+++ /dev/null@@ -1,58 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>--<lipsum>- <copyright>This text is under public domain</copyright>- <title>Tierra y Luna</title>- <author>Federico García Lorca</author>- <text>- me quedo con el transparente hombrecillo- que come los huevos de la golondrina- me quedo con el nino desnudo- que pisotean los borrachos de brooklyn- con las criaturas mudas que pasan bajo los arcos- con el arroyo de venas ansioso de abrir sus manecitas-- tierra tan sólo tierra- tierra para los manteles estremecidos- para la pupila viciosa de nube- para las heridas recientes y el húmedo pensamiento- tierra para todo lo que huye de la tierra-- no es la ceniza en vilo de las cosas quemadas- ni los muertos que mueven sus lenguas bajo los árboles- es la tierra desnuda que bala por el cielo- y deja atrás los grupos ligeros de ballenas-- es la tierra alegrísima imperturbable nadadora- la que yo encuentro en el nino y en las criaturas que pasan los arcos- viva la tierra de mi pulso y del baile de los helechos- que deja a veces por el aire un duro perfil de faraón-- me quedo con la mujer fría- donde se queman los musgos inocentes- me quedo con los borrachos de brooklyn- que pisan al nino desnudo- me quedo con los signos desgarrados- de la lenta comida de los osos-- pero entonces baja la luna despenada por las escaleras- poniendo las ciudades de hule celeste y talco sensitivo- llenando los pies de mármol la llanura sin recodos- y olvidando bajo las sillas diminutas carcajadas de algodón-- oh diana diana diana vacía- convexa resonancia donde la abeja se vuelve loca- mi amor de paso tránsito larga muerte gustada- nunca la piel ilesa de tu desnudo huido-- es tierra dios mío tierra lo que vengo buscando- embozo de horizonte latido y sepultura- es dolor que se acaba y amor que se consume- torre de sangre abierta con las manos quemadas-- pero la luna subía y bajaba las escaleras- repartiendo lentejas desangradas en los ojos- dando escobazos de plata a los ninos de los muelles- y borrando mi apariencia por el término del aire- </text>-</lipsum>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/DevToys.Tools.csproj b/src/app/dev/DevToys.Tools/DevToys.Tools.csprojdeleted file mode 100644index 4d25145f9..000000000--- a/src/app/dev/DevToys.Tools/DevToys.Tools.csproj+++ /dev/null@@ -1,440 +0,0 @@-<Project Sdk="Microsoft.NET.Sdk">- <PropertyGroup>- <TargetFrameworks>$(NetCore)</TargetFrameworks>-- <!-- See https://learn.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props#enabledynamicloading -->- <EnableDynamicLoading>true</EnableDynamicLoading>-- <!-- NuGet package -->- <IsPackable>true</IsPackable>- <GeneratePackageOnBuild>true</GeneratePackageOnBuild>- <IncludeBuildOutput>true</IncludeBuildOutput>- <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>-- <Version>2.0.0-pre.0</Version>- <Title>DevToys.Tools</Title>- <Description>A set of offline tools installed by default with DevToys.</Description>- <PackageProjectUrl>https://devtoys.app</PackageProjectUrl>- <RepositoryUrl>https://github.com/veler/DevToys</RepositoryUrl>- <Authors>veler,btiteux</Authors>- </PropertyGroup>- <ItemGroup>- <ProjectReference Include="..\DevToys.Api\DevToys.Api.csproj">- <!-- This tells MSBuild to not copy DevToys.Api.dll to the output -->- <Private>false</Private>- <!-- This setting has the same effect as <Private>false</Private> but works on package references -->- <ExcludeAssets>runtime</ExcludeAssets>- </ProjectReference>-- <!--- <PackageReference Include="DevToys.Api" Version="2.0.0">- <ExcludeAssets>runtime</ExcludeAssets>- </PackageReference>- -->- </ItemGroup>- <ItemGroup>- <Compile Update="Properties\Resources.Designer.cs">- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- <DependentUpon>Resources.resx</DependentUpon>- </Compile>- <Compile Update="Strings\GlobalStrings\GlobalStrings.Designer.cs">- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- <DependentUpon>GlobalStrings.resx</DependentUpon>- </Compile>- <Compile Update="Tools\Converters\NumberBase\NumberBaseConverter.Designer.cs">- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- <DependentUpon>NumberBaseConverter.resx</DependentUpon>- </Compile>- <Compile Update="Tools\Converters\Cron\CronParser.Designer.cs">- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- <DependentUpon>CronParser.resx</DependentUpon>- </Compile>- <Compile Update="Tools\EncodersDecoders\JsonWebToken\JsonWebTokenEncoderDecoder.Designer.cs">- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- <DependentUpon>JsonWebTokenEncoderDecoder.resx</DependentUpon>- </Compile>- <Compile Update="Tools\EncodersDecoders\Certificate\CertificateDecoder.Designer.cs">- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- <DependentUpon>CertificateDecoder.resx</DependentUpon>- </Compile>- <Compile Update="Tools\Formatters\Json\JsonFormatter.Designer.cs">- <DependentUpon>JsonFormatter.resx</DependentUpon>- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- </Compile>- <Compile Update="Tools\Formatters\Sql\SqlFormatter.Designer.cs">- <DependentUpon>SqlFormatter.resx</DependentUpon>- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- </Compile>- <Compile Update="Tools\Formatters\Xml\XmlFormatter.Designer.cs">- <DependentUpon>XmlFormatter.resx</DependentUpon>- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- </Compile>- <Compile Update="Tools\Formatters\Formatters.Designer.cs">- <DependentUpon>Formatters.resx</DependentUpon>- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- </Compile>- <Compile Update="Tools\Converters\JsonTable\JsonTableConverter.Designer.cs">- <DependentUpon>JsonTableConverter.resx</DependentUpon>- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- </Compile>- <Compile Update="Tools\Converters\Date\DateConverter.Designer.cs">- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- <DependentUpon>DateConverter.resx</DependentUpon>- </Compile>- <Compile Update="Tools\EncodersDecoders\Base64Image\Base64ImageEncoderDecoder.Designer.cs">- <DependentUpon>Base64ImageEncoderDecoder.resx</DependentUpon>- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- </Compile>- <Compile Update="Tools\EncodersDecoders\GZip\GZipEncoderDecoder.Designer.cs">- <DependentUpon>GZipEncoderDecoder.resx</DependentUpon>- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- </Compile>- <Compile Update="Tools\EncodersDecoders\Url\UrlEncoderDecoder.Designer.cs">- <DependentUpon>UrlEncoderDecoder.resx</DependentUpon>- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- </Compile>- <Compile Update="Tools\Converters\Converters.Designer.cs">- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- <DependentUpon>Converters.resx</DependentUpon>- </Compile>- <Compile Update="Tools\Converters\JsonYaml\JsonYamlConverter.Designer.cs">- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- <DependentUpon>JsonYamlConverter.resx</DependentUpon>- </Compile>- <Compile Update="Tools\EncodersDecoders\Html\HtmlEncoderDecoder.Designer.cs">- <DependentUpon>HtmlEncoderDecoder.resx</DependentUpon>- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- </Compile>- <Compile Update="Tools\EncodersDecoders\Base64Text\Base64TextEncoderDecoder.Designer.cs">- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- <DependentUpon>Base64TextEncoderDecoder.resx</DependentUpon>- </Compile>- <Compile Update="Tools\EncodersDecoders\EncodersDecoders.Designer.cs">- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- <DependentUpon>EncodersDecoders.resx</DependentUpon>- </Compile>- <Compile Update="Tools\Generators\Generators.Designer.cs">- <DependentUpon>Generators.resx</DependentUpon>- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- </Compile>- <Compile Update="Tools\Generators\HashAndChecksum\HashAndChecksumGenerator.Designer.cs">- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- <DependentUpon>HashAndChecksumGenerator.resx</DependentUpon>- </Compile>- <Compile Update="Tools\Generators\LoremIpsum\LoremIpsumGenerator.Designer.cs">- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- <DependentUpon>LoremIpsumGenerator.resx</DependentUpon>- </Compile>- <Compile Update="Tools\Generators\Password\PasswordGenerator.Designer.cs">- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- <DependentUpon>PasswordGenerator.resx</DependentUpon>- </Compile>- <Compile Update="Tools\EncodersDecoders\QRCode\QRCodeEncoderDecoder.Designer.cs">- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- <DependentUpon>QRCodeEncoderDecoder.resx</DependentUpon>- </Compile>- <Compile Update="Tools\Generators\UUID\UUIDGenerator.Designer.cs">- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- <DependentUpon>UUIDGenerator.resx</DependentUpon>- </Compile>- <Compile Update="Tools\Graphic\ColorBlindnessSimulator\ColorBlindnessSimulator.Designer.cs">- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- <DependentUpon>ColorBlindnessSimulator.resx</DependentUpon>- </Compile>- <Compile Update="Tools\Graphic\Graphic.Designer.cs">- <DependentUpon>Graphic.resx</DependentUpon>- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- </Compile>- <Compile Update="Tools\Graphic\ImageConverter\ImageConverter.Designer.cs">- <DependentUpon>ImageConverter.resx</DependentUpon>- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- </Compile>- <Compile Update="Tools\Testers\JsonPathTester\JsonPathTester.Designer.cs">- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- <DependentUpon>JsonPathTester.resx</DependentUpon>- </Compile>- <Compile Update="Tools\Testers\Testers.Designer.cs">- <DependentUpon>Testers.resx</DependentUpon>- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- </Compile>- <Compile Update="Tools\Text\AnalyzerAndUtilities\AnalyzerAndUtilities.Designer.cs">- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- <DependentUpon>AnalyzerAndUtilities.resx</DependentUpon>- </Compile>- <Compile Update="Tools\Text\Compare\TextCompare.Designer.cs">- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- <DependentUpon>TextCompare.resx</DependentUpon>- </Compile>- <Compile Update="Tools\Text\EscapeUnescape\EscapeUnescape.Designer.cs">- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- <DependentUpon>EscapeUnescape.resx</DependentUpon>- </Compile>- <Compile Update="Tools\Text\ListCompare\ListCompare.Designer.cs">- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- <DependentUpon>ListCompare.resx</DependentUpon>- </Compile>- <Compile Update="Tools\Text\MarkdownPreview\MarkdownPreview.Designer.cs">- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- <DependentUpon>MarkdownPreview.resx</DependentUpon>- </Compile>- <Compile Update="Tools\Testers\RegExTester\RegExTester.Designer.cs">- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- <DependentUpon>RegExTester.resx</DependentUpon>- </Compile>- <Compile Update="Tools\Text\Text.Designer.cs">- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- <DependentUpon>Text.resx</DependentUpon>- </Compile>- <Compile Update="Tools\Testers\XMLTester\XMLTester.Designer.cs">- <DesignTime>True</DesignTime>- <AutoGen>True</AutoGen>- <DependentUpon>XMLTester.resx</DependentUpon>- </Compile>- </ItemGroup>- <ItemGroup>- <EmbeddedResource Update="Properties\Resources.resx">- <Generator>ResXFileCodeGenerator</Generator>- <LastGenOutput>Resources.Designer.cs</LastGenOutput>- </EmbeddedResource>- <EmbeddedResource Update="Strings\GlobalStrings\GlobalStrings.resx">- <Generator>ResXFileCodeGenerator</Generator>- <LastGenOutput>GlobalStrings.Designer.cs</LastGenOutput>- </EmbeddedResource>- <EmbeddedResource Update="Tools\Converters\Cron\CronParser.resx">- <Generator>ResXFileCodeGenerator</Generator>- <LastGenOutput>CronParser.Designer.cs</LastGenOutput>- </EmbeddedResource>- <EmbeddedResource Update="Tools\Converters\JsonTable\JsonTableConverter.resx">- <LastGenOutput>JsonTableConverter.Designer.cs</LastGenOutput>- <Generator>ResXFileCodeGenerator</Generator>- </EmbeddedResource>- <EmbeddedResource Update="Tools\Converters\NumberBase\NumberBaseConverter.resx">- <Generator>ResXFileCodeGenerator</Generator>- <LastGenOutput>NumberBaseConverter.Designer.cs</LastGenOutput>- </EmbeddedResource>- <EmbeddedResource Update="Tools\EncodersDecoders\Certificate\CertificateDecoder.resx">- <Generator>ResXFileCodeGenerator</Generator>- <LastGenOutput>CertificateDecoder.Designer.cs</LastGenOutput>- </EmbeddedResource>- <EmbeddedResource Update="Tools\Formatters\Json\JsonFormatter.resx">- <LastGenOutput>JsonFormatter.Designer.cs</LastGenOutput>- <Generator>ResXFileCodeGenerator</Generator>- </EmbeddedResource>- <EmbeddedResource Update="Tools\EncodersDecoders\JsonWebToken\JsonWebTokenEncoderDecoder.resx">- <LastGenOutput>JsonWebTokenEncoderDecoder.Designer.cs</LastGenOutput>- <Generator>ResXFileCodeGenerator</Generator>- </EmbeddedResource>- <EmbeddedResource Update="Tools\Formatters\Sql\SqlFormatter.resx">- <LastGenOutput>SqlFormatter.Designer.cs</LastGenOutput>- <Generator>ResXFileCodeGenerator</Generator>- </EmbeddedResource>- <EmbeddedResource Update="Tools\Formatters\Xml\XmlFormatter.resx">- <LastGenOutput>XmlFormatter.Designer.cs</LastGenOutput>- <Generator>ResXFileCodeGenerator</Generator>- </EmbeddedResource>- <EmbeddedResource Update="Tools\Formatters\Formatters.resx">- <LastGenOutput>Formatters.Designer.cs</LastGenOutput>- <Generator>ResXFileCodeGenerator</Generator>- </EmbeddedResource>- <EmbeddedResource Update="Tools\Converters\Date\DateConverter.resx">- <Generator>ResXFileCodeGenerator</Generator>- <LastGenOutput>DateConverter.Designer.cs</LastGenOutput>- </EmbeddedResource>- <EmbeddedResource Update="Tools\EncodersDecoders\Base64Image\Base64ImageEncoderDecoder.resx">- <LastGenOutput>Base64ImageEncoderDecoder.Designer.cs</LastGenOutput>- <Generator>ResXFileCodeGenerator</Generator>- </EmbeddedResource>- <EmbeddedResource Update="Tools\EncodersDecoders\GZip\GZipEncoderDecoder.resx">- <LastGenOutput>GZipEncoderDecoder.Designer.cs</LastGenOutput>- <Generator>ResXFileCodeGenerator</Generator>- </EmbeddedResource>- <EmbeddedResource Update="Tools\EncodersDecoders\Url\UrlEncoderDecoder.resx">- <LastGenOutput>UrlEncoderDecoder.Designer.cs</LastGenOutput>- <Generator>ResXFileCodeGenerator</Generator>- </EmbeddedResource>- <EmbeddedResource Update="Tools\Converters\Converters.resx">- <Generator>ResXFileCodeGenerator</Generator>- <LastGenOutput>Converters.Designer.cs</LastGenOutput>- </EmbeddedResource>- <EmbeddedResource Update="Tools\Converters\JsonYaml\JsonYamlConverter.resx">- <Generator>ResXFileCodeGenerator</Generator>- <LastGenOutput>JsonYamlConverter.Designer.cs</LastGenOutput>- </EmbeddedResource>- <EmbeddedResource Update="Tools\EncodersDecoders\Html\HtmlEncoderDecoder.resx">- <LastGenOutput>HtmlEncoderDecoder.Designer.cs</LastGenOutput>- <Generator>ResXFileCodeGenerator</Generator>- </EmbeddedResource>- <EmbeddedResource Update="Tools\EncodersDecoders\Base64Text\Base64TextEncoderDecoder.resx">- <Generator>ResXFileCodeGenerator</Generator>- <LastGenOutput>Base64TextEncoderDecoder.Designer.cs</LastGenOutput>- </EmbeddedResource>- <EmbeddedResource Update="Tools\EncodersDecoders\EncodersDecoders.resx">- <Generator>ResXFileCodeGenerator</Generator>- <LastGenOutput>EncodersDecoders.Designer.cs</LastGenOutput>- </EmbeddedResource>- <EmbeddedResource Update="Tools\Generators\Generators.resx">- <LastGenOutput>Generators.Designer.cs</LastGenOutput>- <Generator>ResXFileCodeGenerator</Generator>- </EmbeddedResource>- <EmbeddedResource Update="Tools\Generators\HashAndChecksum\HashAndChecksumGenerator.resx">- <Generator>ResXFileCodeGenerator</Generator>- <LastGenOutput>HashAndChecksumGenerator.Designer.cs</LastGenOutput>- </EmbeddedResource>- <EmbeddedResource Update="Tools\Generators\LoremIpsum\LoremIpsumGenerator.resx">- <Generator>ResXFileCodeGenerator</Generator>- <LastGenOutput>LoremIpsumGenerator.Designer.cs</LastGenOutput>- </EmbeddedResource>- <EmbeddedResource Update="Tools\Generators\Password\PasswordGenerator.resx">- <Generator>ResXFileCodeGenerator</Generator>- <LastGenOutput>PasswordGenerator.Designer.cs</LastGenOutput>- </EmbeddedResource>- <EmbeddedResource Update="Tools\EncodersDecoders\QRCode\QRCodeEncoderDecoder.resx">- <Generator>ResXFileCodeGenerator</Generator>- <LastGenOutput>QRCodeEncoderDecoder.Designer.cs</LastGenOutput>- </EmbeddedResource>- <EmbeddedResource Update="Tools\Generators\UUID\UUIDGenerator.resx">- <Generator>ResXFileCodeGenerator</Generator>- <LastGenOutput>UUIDGenerator.Designer.cs</LastGenOutput>- </EmbeddedResource>- <EmbeddedResource Update="Tools\Graphic\ColorBlindnessSimulator\ColorBlindnessSimulator.resx">- <Generator>ResXFileCodeGenerator</Generator>- <LastGenOutput>ColorBlindnessSimulator.Designer.cs</LastGenOutput>- </EmbeddedResource>- <EmbeddedResource Update="Tools\Graphic\Graphic.resx">- <LastGenOutput>Graphic.Designer.cs</LastGenOutput>- <Generator>ResXFileCodeGenerator</Generator>- </EmbeddedResource>- <EmbeddedResource Update="Tools\Graphic\ImageConverter\ImageConverter.resx">- <LastGenOutput>ImageConverter.Designer.cs</LastGenOutput>- <Generator>ResXFileCodeGenerator</Generator>- </EmbeddedResource>- <EmbeddedResource Update="Tools\Testers\JsonPathTester\JsonPathTester.resx">- <Generator>ResXFileCodeGenerator</Generator>- <LastGenOutput>JsonPathTester.Designer.cs</LastGenOutput>- </EmbeddedResource>- <EmbeddedResource Update="Tools\Testers\Testers.resx">- <LastGenOutput>Testers.Designer.cs</LastGenOutput>- <Generator>ResXFileCodeGenerator</Generator>- </EmbeddedResource>- <EmbeddedResource Update="Tools\Text\AnalyzerAndUtilities\AnalyzerAndUtilities.resx">- <Generator>ResXFileCodeGenerator</Generator>- <LastGenOutput>AnalyzerAndUtilities.Designer.cs</LastGenOutput>- </EmbeddedResource>- <EmbeddedResource Update="Tools\Text\ListCompare\ListCompare.resx">- <LastGenOutput>ListCompare.Designer.cs</LastGenOutput>- <Generator>ResXFileCodeGenerator</Generator>- </EmbeddedResource>- <EmbeddedResource Update="Tools\Text\Compare\TextCompare.resx">- <Generator>ResXFileCodeGenerator</Generator>- <LastGenOutput>TextCompare.Designer.cs</LastGenOutput>- </EmbeddedResource>- <EmbeddedResource Update="Tools\Text\EscapeUnescape\EscapeUnescape.resx">- <Generator>ResXFileCodeGenerator</Generator>- <LastGenOutput>EscapeUnescape.Designer.cs</LastGenOutput>- </EmbeddedResource>- <EmbeddedResource Update="Tools\Text\MarkdownPreview\MarkdownPreview.resx">- <Generator>ResXFileCodeGenerator</Generator>- <LastGenOutput>MarkdownPreview.Designer.cs</LastGenOutput>- </EmbeddedResource>- <EmbeddedResource Update="Tools\Testers\RegExTester\RegExTester.resx">- <Generator>ResXFileCodeGenerator</Generator>- <LastGenOutput>RegExTester.Designer.cs</LastGenOutput>- </EmbeddedResource>- <EmbeddedResource Update="Tools\Text\Text.resx">- <Generator>ResXFileCodeGenerator</Generator>- <LastGenOutput>Text.Designer.cs</LastGenOutput>- </EmbeddedResource>- <EmbeddedResource Update="Tools\Testers\XMLTester\XMLTester.resx">- <Generator>ResXFileCodeGenerator</Generator>- <LastGenOutput>XMLTester.Designer.cs</LastGenOutput>- </EmbeddedResource>- </ItemGroup>-- <ItemGroup>- <EmbeddedResource Include="..\..\..\..\assets\font\DevToys-Tools-Icons.ttf" Link="Assets\fonts\DevToys-Tools-Icons.ttf" />- <EmbeddedResource Include="Assets\GitHubMarkdown\index.html" />- <EmbeddedResource Include="Assets\Lipsums\childharold.xml" />- <EmbeddedResource Include="Assets\Lipsums\decameron.xml" />- <EmbeddedResource Include="Assets\Lipsums\faust.xml" />- <EmbeddedResource Include="Assets\Lipsums\inderfremde.xml" />- <EmbeddedResource Include="Assets\Lipsums\lebateauivre.xml" />- <EmbeddedResource Include="Assets\Lipsums\lemasque.xml" />- <EmbeddedResource Include="Assets\Lipsums\LICENSE.MD" />- <EmbeddedResource Include="Assets\Lipsums\loremipsum.xml" />- <EmbeddedResource Include="Assets\Lipsums\nagyonfaj.xml" />- <EmbeddedResource Include="Assets\Lipsums\omagyar.xml" />- <EmbeddedResource Include="Assets\Lipsums\robinsonokruso.xml" />- <EmbeddedResource Include="Assets\Lipsums\theraven.xml" />- <EmbeddedResource Include="Assets\Lipsums\tierrayluna.xml" />- </ItemGroup>-- <ItemGroup>- <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />- <PackageReference Include="CronExpressionDescriptor" />- <PackageReference Include="Cronos" />- <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" />- <PackageReference Include="YamlDotNet" />- <PackageReference Include="Markdig" />- <PackageReference Include="Markdown.ColorCode" />- <PackageReference Include="ZXing.Net" />- <PackageReference Include="ZXing.Net.Bindings.ImageSharp.V3" />- <PackageReference Include="Newtonsoft.Json">- <ExcludeAssets>runtime</ExcludeAssets>- </PackageReference>- <PackageReference Include="SixLabors.ImageSharp">- <ExcludeAssets>runtime</ExcludeAssets>- </PackageReference>- </ItemGroup>-- <Target Name="IncludeAllFilesInTargetDir" BeforeTargets="_GetPackageFiles">- <ItemGroup>- <None Include="$(OutputPath)\**">- <Pack>true</Pack>- <PackagePath>lib</PackagePath>- </None>- </ItemGroup>- </Target>-- <Target Name="CopyPluginAfterBuild" AfterTargets="Pack">- <Copy SourceFiles="$(PackageOutputPath)\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$(PluginNupkgPath)" SkipUnchangedFiles="false" OverwriteReadOnlyFiles="true" Retries="10" RetryDelayMilliseconds="1000" />- </Target>--</Project>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/DevToysToolsResourceManagerAssemblyIdentifier.cs b/src/app/dev/DevToys.Tools/DevToysToolsResourceManagerAssemblyIdentifier.csdeleted file mode 100644index 555344b90..000000000--- a/src/app/dev/DevToys.Tools/DevToysToolsResourceManagerAssemblyIdentifier.cs+++ /dev/null@@ -1,20 +0,0 @@-using System.Reflection;--namespace DevToys.Tools;--[Export(typeof(IResourceAssemblyIdentifier))]-[Name(nameof(DevToysToolsResourceManagerAssemblyIdentifier))]-public sealed class DevToysToolsResourceManagerAssemblyIdentifier : IResourceAssemblyIdentifier-{- public ValueTask<FontDefinition[]> GetFontDefinitionsAsync()- {- var assembly = Assembly.GetExecutingAssembly();- string resourceName = "DevToys.Tools.Assets.fonts.DevToys-Tools-Icons.ttf";-- Stream stream = assembly.GetManifestResourceStream(resourceName)!;- return new ValueTask<FontDefinition[]>(new[]- {- new FontDefinition("DevToys-Tools-Icons", stream)- });- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/Base64Helper.cs b/src/app/dev/DevToys.Tools/Helpers/Base64Helper.csdeleted file mode 100644index 1f5c835c4..000000000--- a/src/app/dev/DevToys.Tools/Helpers/Base64Helper.cs+++ /dev/null@@ -1,180 +0,0 @@-using System.Text;-using System.Text.RegularExpressions;-using DevToys.Tools.Models;-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.Helpers;--internal static partial class Base64Helper-{- internal static bool IsBase64DataStrict(string? data)- {- if (string.IsNullOrWhiteSpace(data))- {- return false;- }-- data = data!.Trim();-- if (data.Length % 4 != 0)- {- return false;- }-- if (Base64Regex().IsMatch(data))- {- return false;- }-- int equalIndex = data.IndexOf('=');- int length = data.Length;-- if (!(equalIndex == -1 || equalIndex == length - 1 || equalIndex == length - 2 && data[length - 1] == '='))- {- return false;- }-- string? decoded;-- try- {- byte[]? decodedData = Convert.FromBase64String(data);- decoded = Encoding.UTF8.GetString(decodedData);- }- catch (Exception)- {- return false;- }-- //check for special chars that you know should not be there- char current;- for (int i = 0; i < decoded.Length; i++)- {- current = decoded[i];- if (current == 65533)- {- return false;- }-- if (!(current == 0x9- || current == 0xA- || current == 0xD- || current >= 0x20 && current <= 0xD7FF- || current >= 0xE000 && current <= 0xFFFD- || current >= 0x10000 && current <= 0x10FFFF))- {- return false;- }- }-- return true;- }-- internal static string FromTextToBase64(string? data, Base64Encoding encoding, ILogger logger, CancellationToken cancellationToken)- {- if (string.IsNullOrWhiteSpace(data))- {- return string.Empty;- }-- string? encoded;- try- {- Encoding encoder = GetEncoder(encoding);- byte[]? dataBytes = encoder.GetBytes(data);-- cancellationToken.ThrowIfCancellationRequested();-- encoded = Convert.ToBase64String(dataBytes);-- cancellationToken.ThrowIfCancellationRequested();- }- catch (OperationCanceledException)- {- return string.Empty;- }- catch (Exception ex)- {- LogFailEncodeBase64(logger, ex, encoding);- return ex.Message;- }-- return encoded;- }-- internal static string FromBase64ToText(string? data, Base64Encoding encoding, ILogger logger, CancellationToken cancellationToken)- {- if (string.IsNullOrWhiteSpace(data))- {- return string.Empty;- }-- int remainder = data!.Length % 4;- if (remainder > 0)- {- int padding = 4 - remainder;- data = data.PadRight(data.Length + padding, '=');- }-- string? decoded = string.Empty;-- try- {- byte[]? decodedData = Convert.FromBase64String(data);- cancellationToken.ThrowIfCancellationRequested();-- Encoding encoder = GetEncoder(encoding);-- if (encoder is UTF8Encoding && decodedData != null)- {- byte[] preamble = encoder.GetPreamble();- if (decodedData.Take(preamble.Length).SequenceEqual(preamble))- {- // need to keep it this way to have the dom char- decoded += Encoding.Unicode.GetString(preamble, 0, 1);- }- }-- cancellationToken.ThrowIfCancellationRequested();-- if (decodedData is not null)- {- decoded += encoder.GetString(decodedData);- }- }- catch (Exception ex) when (ex is OperationCanceledException || ex is FormatException)- {- // ignore;- }- catch (Exception ex)- {- LogFailDecodeBase64(logger, ex, encoding);- return ex.Message;- }-- return decoded;- }-- private static Encoding GetEncoder(Base64Encoding encoding)- {- return encoding switch- {- Base64Encoding.Utf8 => new UTF8Encoding(true),- Base64Encoding.Ascii => Encoding.ASCII,- _ => throw new NotSupportedException(),- };- }-- private static void LogFailEncodeBase64(ILogger logger, Exception exception, Base64Encoding encoding)- {- logger.LogError(0, exception, "Failed to encode text to Base64. Encoding mode: '{encoding}'", encoding);- }-- private static void LogFailDecodeBase64(ILogger logger, Exception exception, Base64Encoding encoding)- {- logger.LogError(1, exception, "Failed to decode Base64t to text. Encoding mode: '{encoding}'", encoding);- }-- [GeneratedRegex("[^A-Z0-9+/=]", RegexOptions.IgnoreCase, "en-US")]- private static partial Regex Base64Regex();-}diff --git a/src/app/dev/DevToys.Tools/Helpers/CertificateHelper.cs b/src/app/dev/DevToys.Tools/Helpers/CertificateHelper.csdeleted file mode 100644index 994ef96e9..000000000--- a/src/app/dev/DevToys.Tools/Helpers/CertificateHelper.cs+++ /dev/null@@ -1,125 +0,0 @@-using System.Security.Cryptography;-using System.Security.Cryptography.X509Certificates;-using System.Text;-using DevToys.Tools.Tools.EncodersDecoders.Certificate;-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.Helpers;--internal static class CertificateHelper-{- private const string BeginCertificate = "BEGIN CERTIFICATE";- private const string BeginCertificateRequest = "BEGIN CERTIFICATE REQUEST";-- // "The specified password is not correct." (ERROR_INVALID_PASSWORD)- private const int ERROR_INVALID_PASSWORD_HRESULT = unchecked((int)0x80070056);-- /// <summary>- /// Returns the friendly formatted, decoded certificate details.- /// CSR format is currently not supported in UWP, but is in .NET 7 <see href="https://learn.microsoft.com/en-us/dotnet/api/system.security.cryptography.x509certificates.certificaterequest.loadsigningrequest?view=net-7.0"/>- /// PEM format is limited by the current framework version <see href="https://learn.microsoft.com/en-us/dotnet/api/system.security.cryptography.x509certificates.x509certificate2.createfrompemfile?view=net-7.0"/>- /// </summary>- /// <param name="input">Certificate data</param>- /// <param name="password">Password for protected private key. This should only be relevant for decoding pfx format.</param>- /// <returns>Certificate details</returns>- internal static bool TryDecodeCertificate(ILogger logger, string input, string? password, out string? decoded)- {- decoded = null;- string publicCert = input;- if (publicCert.Contains('-'))- {- string[] splitCert = input.Split('-', StringSplitOptions.RemoveEmptyEntries);- for (int i = 0; i < splitCert.Length; i++)- {- if (string.Equals(splitCert[i], BeginCertificate, StringComparison.OrdinalIgnoreCase))- {- publicCert = splitCert[i + 1];- break;- }- // If this is a valid certificate request, we should still return true with the error message- else if (string.Equals(splitCert[i], BeginCertificateRequest, StringComparison.OrdinalIgnoreCase))- {- decoded = CertificateDecoder.UnsupportedFormatError;- return false;- }- }- }-- X509Certificate2 certificate;- try- {- certificate = new X509Certificate2(Convert.FromBase64String(publicCert), password);- decoded = certificate.ToString();- }- catch (CryptographicException wce)- {- // If this is a valid certificate, but an incorrect/missing password, we should still return true- if (wce.HResult == ERROR_INVALID_PASSWORD_HRESULT)- {- decoded = CertificateDecoder.InvalidPasswordError;- }-- return false;- }- catch (Exception)- {- decoded = CertificateDecoder.UnsupportedFormatError;- return false;- }-- if (!string.IsNullOrEmpty(decoded) && certificate.Extensions.OfType<X509Extension>().Any())- {- decoded = string.Join(Environment.NewLine, decoded, DecodeExtensions(logger, certificate));- }-- return true;- }-- private static string DecodeExtensions(ILogger logger, X509Certificate2 certificate)- {- // Try to decode the X.509 extensions.- try- {- StringBuilder extensionData = new();- foreach (X509Extension x509Extension in certificate.Extensions)- {- AsnEncodedData asnEncodedData = new(x509Extension.Oid, x509Extension.RawData);-- // Add the name in brackets to match the previous output from X509Certificate.ToString()- extensionData.AppendLine($"[{x509Extension.Oid?.FriendlyName}]");-- // Add each line of the data, indented by two spaces to match the output from X509Certificate.ToString()- foreach (string dataLine in asnEncodedData.Format(multiLine: true).Split(Environment.NewLine))- {- extensionData.AppendLine($" {dataLine}");- }- }-- return extensionData.ToString().Trim();- }- catch (Exception ex)- {- logger.LogError(ex, "Failed to parse X.509 extensions from certificate.");- }-- return string.Empty;- }-- /// <summary>- /// Get the string data from a certificate file.- /// If the string is pem format with plain text values, it will return as is.- /// Otherwise, the base64 encoded result will be returned.- /// </summary>- /// <param name="data">Certificate data from file</param>- /// <returns>string result of certificate</returns>- internal static string GetRawCertificateString(byte[] data)- {- string value = Encoding.UTF8.GetString(data);- if (value.Contains(BeginCertificate, StringComparison.OrdinalIgnoreCase))- {- return value;- }-- return Convert.ToBase64String(data);- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/ColorBlindnessSimulatorHelper.cs b/src/app/dev/DevToys.Tools/Helpers/ColorBlindnessSimulatorHelper.csdeleted file mode 100644index ad62fa8fa..000000000--- a/src/app/dev/DevToys.Tools/Helpers/ColorBlindnessSimulatorHelper.cs+++ /dev/null@@ -1,208 +0,0 @@-using SixLabors.ImageSharp;-using SixLabors.ImageSharp.PixelFormats;-using SixLabors.ImageSharp.Processing;--namespace DevToys.Tools.Helpers;--internal static class ColorBlindnessSimulatorHelper-{- // Original source: https://github.com/DaltonLens/libDaltonLens/blob/master/libDaltonLens.c- // http://daltonlens.org-- private struct Brettel1997Parameters- {- /// <summary>- /// Transformation using plane 1 == rgbFromLms . projection1 . lmsFromRgb- /// </summary>- internal float[] RgbCvdFromRgb1 { get; set; }-- /// <summary>- /// Full transformation using plane 2 == rgbFromLms . projection2 . lmsFromRgb- /// </summary>- internal float[] RgbCvdFromRgb2 { get; set; }-- /// <summary>- /// Normal of the separation plane to pick the right transform, already in the RGB space == normalInLms . lmsFromRgb- /// </summary>- internal float[] SeparationPlaneNormalInRgb { get; set; }- }-- /// <summary>- /// Represents the default severity of the color blindness.- /// </summary>- private const float Severity = 1f;-- private static readonly Brettel1997Parameters ProtanopiaParameters- = new()- {- RgbCvdFromRgb1 = new[] { 0.14980f, 1.19548f, -0.34528f, 0.10764f, 0.84864f, 0.04372f, 0.00384f, -0.00540f, 1.00156f },- RgbCvdFromRgb2 = new[] { 0.14570f, 1.16172f, -0.30742f, 0.10816f, 0.85291f, 0.03892f, 0.00386f, -0.00524f, 1.00139f },- SeparationPlaneNormalInRgb = new[] { 0.00048f, 0.00393f, -0.00441f }- };-- private static readonly Brettel1997Parameters TritanopiaParameters- = new()- {- RgbCvdFromRgb1 = new[] { 1.01277f, 0.13548f, -0.14826f, -0.01243f, 0.86812f, 0.14431f, 0.07589f, 0.80500f, 0.11911f },- RgbCvdFromRgb2 = new[] { 0.93678f, 0.18979f, -0.12657f, 0.06154f, 0.81526f, 0.12320f, -0.37562f, 1.12767f, 0.24796f },- SeparationPlaneNormalInRgb = new[] { 0.03901f, -0.02788f, -0.01113f }- };-- private static readonly Brettel1997Parameters DeuteranopiaParameters- = new()- {- RgbCvdFromRgb1 = new[] { 0.36477f, 0.86381f, -0.22858f, 0.26294f, 0.64245f, 0.09462f, -0.02006f, 0.02728f, 0.99278f },- RgbCvdFromRgb2 = new[] { 0.37298f, 0.88166f, -0.25464f, 0.25954f, 0.63506f, 0.10540f, -0.01980f, 0.02784f, 0.99196f },- SeparationPlaneNormalInRgb = new[] { -0.00281f, -0.00611f, 0.00892f }- };-- internal static Image<Rgba32>? SimulateColorBlindness(- Image<Rgba32> inputImage,- ColorBlindnessMode colorBlindnessMode,- Action<int> progressReport,- CancellationToken cancellationToken)- {- return colorBlindnessMode switch- {- ColorBlindnessMode.Protanopia- => SimulateColorBlindness(- inputImage,- ProtanopiaParameters,- progressReport,- cancellationToken),-- ColorBlindnessMode.Tritanopia- => SimulateColorBlindness(- inputImage,- TritanopiaParameters,- progressReport,- cancellationToken),-- ColorBlindnessMode.Deuteranopia- => SimulateColorBlindness(- inputImage,- DeuteranopiaParameters,- progressReport,- cancellationToken),-- _ => throw new NotSupportedException(),- };- }-- private static Image<Rgba32>? SimulateColorBlindness(Image<Rgba32> inputImage, Brettel1997Parameters brettel1997Parameters, Action<int> progressReport, CancellationToken cancellationToken)- {- Guard.IsNotNull(inputImage);-- Image<Rgba32> outputImage = inputImage.Clone();- int imagePixelCount = outputImage.Width * outputImage.Height;- long pixelTreated = 0;- float[]? separationPlaneNormalInRgb = brettel1997Parameters.SeparationPlaneNormalInRgb;-- try- {- outputImage- .ProcessPixelRows(- (PixelAccessor<Rgba32> accessor) =>- {- for (int i = 0; i < outputImage.Height; i++)- {- Span<Rgba32> pixelRow = accessor.GetRowSpan(i);-- // pixelRow.Length has the same value as accessor.Width,- // but using pixelRow.Length allows the JIT to optimize away bounds checks.- for (int j = 0; j < pixelRow.Length; j++)- {- cancellationToken.ThrowIfCancellationRequested();-- // Get a reference to the pixel at position j.- ref Rgba32 pixel = ref pixelRow[j];-- // Convert the pixel to linear RGB.- float linearR = SRgbToLinearRgb(pixel.R);- float linearG = SRgbToLinearRgb(pixel.G);- float linearB = SRgbToLinearRgb(pixel.B);-- float dotWithSepPlane- = linearR * separationPlaneNormalInRgb[0]- + linearG * separationPlaneNormalInRgb[1]- + linearB * separationPlaneNormalInRgb[2];-- float[] rgbCvdFromRgb;- if (dotWithSepPlane >= 0)- {- rgbCvdFromRgb = brettel1997Parameters.RgbCvdFromRgb1;- }- else- {- rgbCvdFromRgb = brettel1997Parameters.RgbCvdFromRgb2;- }-- // Apply the color blindness transform.- float rCvd = rgbCvdFromRgb[0] * linearR + rgbCvdFromRgb[1] * linearG + rgbCvdFromRgb[2] * linearB; // R- float gCvd = rgbCvdFromRgb[3] * linearR + rgbCvdFromRgb[4] * linearG + rgbCvdFromRgb[5] * linearB; // G- float bCvd = rgbCvdFromRgb[6] * linearR + rgbCvdFromRgb[7] * linearG + rgbCvdFromRgb[8] * linearB; // B-- // Apply the severity factor as a linear interpolation.- // It's the same to do it in the RGB space or in the LMS- // space since it's a linear transform.- rCvd = rCvd * Severity + linearR * (1f - Severity);- gCvd = gCvd * Severity + linearG * (1f - Severity);- bCvd = bCvd * Severity + linearB * (1f - Severity);-- // Encode as sRGB and write the result.- var newPixel- = new Rgba32(- LinearRgbToSRgb(rCvd),- LinearRgbToSRgb(gCvd),- LinearRgbToSRgb(bCvd),- pixel.A);-- // Overwrite the pixel referenced by 'ref Rgba32 pixel':- pixel = newPixel;-- pixelTreated++;- progressReport((int)(100 * pixelTreated / imagePixelCount));- }- }- });- }- catch (OperationCanceledException)- {- outputImage.Dispose();- return null;- }-- return outputImage;- }-- private static float SRgbToLinearRgb(byte input)- {- float floatInput = input / 255f;- if (floatInput < 0.04045f)- {- return floatInput / 12.92f;- }-- return MathF.Pow((floatInput + 0.055f) / 1.055f, 2.4f);- }-- private static byte LinearRgbToSRgb(float input)- {- if (input <= 0f)- {- return 0;- }-- if (input >= 1f)- {- return 255;- }-- if (input < 0.0031308f)- {- return (byte)(0.5f + (input * 12.92 * 255f));- }-- return (byte)(255f * (MathF.Pow(input, 1f / 2.4f) * 1.055f - 0.055f));- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/Core/BooleanYamlTypeResolver.cs b/src/app/dev/DevToys.Tools/Helpers/Core/BooleanYamlTypeResolver.csdeleted file mode 100644index 21a351f49..000000000--- a/src/app/dev/DevToys.Tools/Helpers/Core/BooleanYamlTypeResolver.cs+++ /dev/null@@ -1,26 +0,0 @@-using YamlDotNet.Core;-using YamlDotNet.Core.Events;-using YamlDotNet.Serialization;--namespace DevToys.Tools.Helpers.Core;--internal class BooleanYamlTypeResolver : INodeTypeResolver-{- public bool Resolve(NodeEvent? nodeEvent, ref Type currentType)- {- if (nodeEvent is Scalar scalar)- {- // avoid unnecessary parsing attempts- bool couldBeBoolean- = scalar.Style is ScalarStyle.Plain- && (string.Equals(scalar.Value, bool.FalseString, StringComparison.OrdinalIgnoreCase) || string.Equals(scalar.Value, bool.TrueString, StringComparison.OrdinalIgnoreCase));-- if (couldBeBoolean && bool.TryParse(scalar.Value, out _))- {- currentType = typeof(bool);- return true;- }- }- return false;- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/Core/CryptoRandom.cs b/src/app/dev/DevToys.Tools/Helpers/Core/CryptoRandom.csdeleted file mode 100644index 1f2385fcd..000000000--- a/src/app/dev/DevToys.Tools/Helpers/Core/CryptoRandom.cs+++ /dev/null@@ -1,128 +0,0 @@-using System.Security.Cryptography;--namespace DevToys.Tools.Helpers.Core;--/// <summary>-/// A class that mimics the standard Random class in the .NET Framework - but uses a random number generator internally.-/// Taken from IdentityModel (ref.: https://github.com/IdentityModel/IdentityModel/ )-/// Taken from PasswordGenerator (ref.: https://github.com/Darkseal/PasswordGenerator/blob/master/CryptoRandom.cs )-/// </summary>-internal sealed class CryptoRandom : Random-{- private static readonly RandomNumberGenerator Rng = RandomNumberGenerator.Create();- private readonly byte[] _uint32Buffer = new byte[4];-- /// <summary>- /// Output format for unique IDs- /// </summary>- private enum OutputFormat- {- /// <summary>- /// URL-safe Base64- /// </summary>- Base64Url,- /// <summary>- /// Base64- /// </summary>- Base64,- /// <summary>- /// Hex- /// </summary>- Hex- }-- /// <summary>- /// Initializes a new instance of the <see cref="CryptoRandom"/> class.- /// </summary>- internal CryptoRandom()- {- }-- /// <summary>- /// Returns a nonnegative random number.- /// </summary>- /// <returns>- /// A 32-bit signed integer greater than or equal to zero and less than <see cref="F:System.Int32.MaxValue"/>.- /// </returns>- public override int Next()- {- Rng.GetBytes(_uint32Buffer);- return BitConverter.ToInt32(_uint32Buffer, 0) & 0x7FFFFFFF;- }-- /// <summary>- /// Returns a nonnegative random number less than the specified maximum.- /// </summary>- /// <param name="maxValue">The exclusive upper bound of the random number to be generated. <paramref name="maxValue"/> must be greater than or equal to zero.</param>- /// <returns>- /// A 32-bit signed integer greater than or equal to zero, and less than <paramref name="maxValue"/>; that is, the range of return values ordinarily includes zero but not <paramref name="maxValue"/>. However, if <paramref name="maxValue"/> equals zero, <paramref name="maxValue"/> is returned.- /// </returns>- /// <exception cref="T:System.ArgumentOutOfRangeException">- /// <paramref name="maxValue"/> is less than zero.- /// </exception>- public override int Next(int maxValue)- {- ArgumentOutOfRangeException.ThrowIfNegative(maxValue);-- return Next(0, maxValue);- }-- /// <summary>- /// Returns a random number within a specified range.- /// </summary>- /// <param name="minValue">The inclusive lower bound of the random number returned.</param>- /// <param name="maxValue">The exclusive upper bound of the random number returned. <paramref name="maxValue"/> must be greater than or equal to <paramref name="minValue"/>.</param>- /// <returns>- /// A 32-bit signed integer greater than or equal to <paramref name="minValue"/> and less than <paramref name="maxValue"/>; that is, the range of return values includes <paramref name="minValue"/> but not <paramref name="maxValue"/>. If <paramref name="minValue"/> equals <paramref name="maxValue"/>, <paramref name="minValue"/> is returned.- /// </returns>- /// <exception cref="T:System.ArgumentOutOfRangeException">- /// <paramref name="minValue"/> is greater than <paramref name="maxValue"/>.- /// </exception>- public override int Next(int minValue, int maxValue)- {- ArgumentOutOfRangeException.ThrowIfGreaterThan(minValue, maxValue);-- if (minValue == maxValue)- return minValue;-- long diff = maxValue - minValue;-- while (true)- {- Rng.GetBytes(_uint32Buffer);- uint rand = BitConverter.ToUInt32(_uint32Buffer, 0);-- long max = 1 + (long)uint.MaxValue;- long remainder = max % diff;- if (rand < max - remainder)- return (int)(minValue + rand % diff);- }- }-- /// <summary>- /// Returns a random number between 0.0 and 1.0.- /// </summary>- /// <returns>- /// A double-precision floating point number greater than or equal to 0.0, and less than 1.0.- /// </returns>- public override double NextDouble()- {- Rng.GetBytes(_uint32Buffer);- uint rand = BitConverter.ToUInt32(_uint32Buffer, 0);- return rand / (1.0 + uint.MaxValue);- }-- /// <summary>- /// Fills the elements of a specified array of bytes with random numbers.- /// </summary>- /// <param name="buffer">An array of bytes to contain random numbers.</param>- /// <exception cref="T:System.ArgumentNullException">- /// <paramref name="buffer"/> is null.- /// </exception>- public override void NextBytes(byte[] buffer)- {- ArgumentNullException.ThrowIfNull(buffer);-- Rng.GetBytes(buffer);- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/Core/CustomReadOnlyMemoryOfCharComparer.cs b/src/app/dev/DevToys.Tools/Helpers/Core/CustomReadOnlyMemoryOfCharComparer.csdeleted file mode 100644index 4955b5d31..000000000--- a/src/app/dev/DevToys.Tools/Helpers/Core/CustomReadOnlyMemoryOfCharComparer.cs+++ /dev/null@@ -1,19 +0,0 @@-namespace DevToys.Tools.Helpers.Core;--internal delegate int ReadOnlyMemoryOfCharComparerDelegate(ReadOnlyMemory<char> x, ReadOnlyMemory<char> y);--internal sealed class CustomReadOnlyMemoryOfCharComparer : IComparer<ReadOnlyMemory<char>>-{- private readonly ReadOnlyMemoryOfCharComparerDelegate _compareDelegate;-- internal CustomReadOnlyMemoryOfCharComparer(ReadOnlyMemoryOfCharComparerDelegate compareDelegate)- {- Guard.IsNotNull(compareDelegate);- _compareDelegate = compareDelegate;- }-- public int Compare(ReadOnlyMemory<char> x, ReadOnlyMemory<char> y)- {- return _compareDelegate(x, y);- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/Core/DecimalJsonConverter.cs b/src/app/dev/DevToys.Tools/Helpers/Core/DecimalJsonConverter.csdeleted file mode 100644index 599812caf..000000000--- a/src/app/dev/DevToys.Tools/Helpers/Core/DecimalJsonConverter.cs+++ /dev/null@@ -1,21 +0,0 @@-using Newtonsoft.Json;--namespace DevToys.Tools.Helpers.Core;-internal class DecimalJsonConverter : JsonConverter<decimal>-{- public override decimal ReadJson(- JsonReader reader,- Type objectType,- decimal existingValue,- bool hasExistingValue,- JsonSerializer serializer)- {- throw new NotImplementedException();- }-- public override void WriteJson(JsonWriter writer, decimal value, JsonSerializer serializer)- {- // prevent adding trailing zeros- writer.WriteRawValue(value.ToString());- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/Core/DecimalYamlTypeResolver.cs b/src/app/dev/DevToys.Tools/Helpers/Core/DecimalYamlTypeResolver.csdeleted file mode 100644index 91a1e53b1..000000000--- a/src/app/dev/DevToys.Tools/Helpers/Core/DecimalYamlTypeResolver.cs+++ /dev/null@@ -1,27 +0,0 @@-using YamlDotNet.Core;-using YamlDotNet.Core.Events;-using YamlDotNet.Serialization;--namespace DevToys.Tools.Helpers.Core;--internal class DecimalYamlTypeResolver : INodeTypeResolver-{- public bool Resolve(NodeEvent? nodeEvent, ref Type currentType)- {- if (nodeEvent is Scalar scalar)- {- // avoid unnecessary parsing attempts- bool couldBeNumber =- scalar.Style is not ScalarStyle.SingleQuoted and not ScalarStyle.DoubleQuoted &&- scalar.Value.Length != 0 &&- (scalar.Value[0] is >= '0' and <= '9' || scalar.Value[0] == '-');-- if (couldBeNumber && decimal.TryParse(scalar.Value, out _))- {- currentType = typeof(decimal);- return true;- }- }- return false;- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/Core/JsonWebTokenPayloadConverter.cs b/src/app/dev/DevToys.Tools/Helpers/Core/JsonWebTokenPayloadConverter.csdeleted file mode 100644index 5f82d3b33..000000000--- a/src/app/dev/DevToys.Tools/Helpers/Core/JsonWebTokenPayloadConverter.cs+++ /dev/null@@ -1,134 +0,0 @@-using System.Globalization;-using System.Text.Json;-using System.Text.Json.Serialization;--namespace DevToys.Tools.Helpers.Core;--internal sealed class JsonWebTokenPayloadConverter : JsonConverter<Dictionary<string, object>>-{- public override Dictionary<string, object>? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)- {- if (reader.TokenType != JsonTokenType.StartObject)- {- throw new JsonException();- }-- var dictionary = new Dictionary<string, object>();-- while (reader.Read())- {- if (reader.TokenType == JsonTokenType.PropertyName)- {- string propertyName = reader.GetString()!;- dictionary[propertyName] = ReadPropertyValueAsObject(ref reader, true);- }- else if (reader.TokenType == JsonTokenType.EndObject)- {- break;- }- }-- return dictionary;- }-- public override void Write(Utf8JsonWriter writer, Dictionary<string, object> value, JsonSerializerOptions options)- {- throw new NotImplementedException();- }-- internal static object ReadPropertyValueAsObject(ref Utf8JsonReader reader, bool read = false)- {- if (read)- reader.Read();-- switch (reader.TokenType)- {- case JsonTokenType.False:- return false;- case JsonTokenType.Number:- return ReadNumber(ref reader);- case JsonTokenType.True:- return true;- case JsonTokenType.Null:- return null!;- case JsonTokenType.String:- return ReadStringAsObject(ref reader);- case JsonTokenType.StartObject:- return ReadJsonElement(ref reader);- case JsonTokenType.StartArray:- return ReadJsonElement(ref reader);- default:- // There is something broken here as this was called when the reader is pointing at a property.- // It must be a known Json type.- Debug.Assert(false, $"Utf8JsonReader.TokenType is not one of the expected types: False, Number, True, Null, String, StartArray, StartObject. Is: '{reader.TokenType}'.");- return null;- }- }-- internal static object ReadNumber(ref Utf8JsonReader reader)- {- if (reader.TryGetInt32(out int i))- return i;- else if (reader.TryGetInt64(out long l))- return l;- else if (reader.TryGetDouble(out double d))- return d;- else if (reader.TryGetUInt32(out uint u))- return u;- else if (reader.TryGetUInt64(out ulong ul))- return ul;- else if (reader.TryGetSingle(out float f))- return f;- else if (reader.TryGetDecimal(out decimal m))- return m;-- Debug.Assert(false, "expected to read a number, but none of the Utf8JsonReader.TryGet... methods returned true.");-- return ReadJsonElement(ref reader);- }-- internal static object ReadStringAsObject(ref Utf8JsonReader reader, bool read = false)- {- if (read)- {- reader.Read();- }-- // returning null keeps the same logic as JsonSerialization.ReadObject- if (reader.TokenType == JsonTokenType.Null)- {- return null!;- }-- string? originalString = reader.GetString();- try- {- if (DateTime.TryParse(originalString, out DateTime dateTimeValue))- {- dateTimeValue = dateTimeValue.ToUniversalTime();- string dtUniversal = dateTimeValue.ToString("o", CultureInfo.InvariantCulture);- if (dtUniversal.Equals(originalString, StringComparison.Ordinal))- return dateTimeValue;- }- }- catch (Exception)- { }-- return originalString!;- }-- internal static JsonElement ReadJsonElement(ref Utf8JsonReader reader)- {-#if NET6_0_OR_GREATER- JsonElement? jsonElement;- if (JsonElement.TryParseValue(ref reader, out jsonElement))- {- return jsonElement.Value;- }- return default;-#else- using (JsonDocument jsonDocument = JsonDocument.ParseValue(ref reader))- return jsonDocument.RootElement.Clone();-#endif- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/Core/ReadOnlyMemoryEqualityComparer.cs b/src/app/dev/DevToys.Tools/Helpers/Core/ReadOnlyMemoryEqualityComparer.csdeleted file mode 100644index 14235a2a7..000000000--- a/src/app/dev/DevToys.Tools/Helpers/Core/ReadOnlyMemoryEqualityComparer.cs+++ /dev/null@@ -1,20 +0,0 @@-namespace DevToys.Tools.Helpers.Core;-internal class ReadOnlyMemoryEqualityComparer : IEqualityComparer<ReadOnlyMemory<char>>-{- private readonly StringComparison _comparisonType;-- public ReadOnlyMemoryEqualityComparer(bool caseSensitive)- {- _comparisonType = caseSensitive ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase;- }-- public bool Equals(ReadOnlyMemory<char> x, ReadOnlyMemory<char> y)- {- return x.Span.Equals(y.Span, _comparisonType);- }-- public int GetHashCode(ReadOnlyMemory<char> obj)- {- return obj.ToString().GetHashCode(_comparisonType);- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/CronHelper.cs b/src/app/dev/DevToys.Tools/Helpers/CronHelper.csdeleted file mode 100644index af4fe2f08..000000000--- a/src/app/dev/DevToys.Tools/Helpers/CronHelper.cs+++ /dev/null@@ -1,85 +0,0 @@-using System.Globalization;-using CronExpressionDescriptor;-using Cronos;-using DevToys.Tools.Tools.Converters.Cron;--namespace DevToys.Tools.Helpers;--internal static class CronHelper-{- internal static bool TryGenerateNextSchedulesAndDescription(- string cronExpression,- string dateFormat,- bool includeSeconds,- int maxScheduleCount,- out string schedule,- out string description,- out string error)- {- if (string.IsNullOrEmpty(cronExpression))- {- schedule = string.Empty;- description = string.Empty;- error = string.Empty;- return true;- }-- // Validate date format- if (!ValidateDateTimeFormat(dateFormat))- {- schedule = string.Empty;- description = string.Empty;- error = CronParser.OutputFormatErrorMessage;- return false;- }-- try- {- // Attempt to generate a description- description = ExpressionDescriptor.GetDescription(cronExpression);-- var expression- = CronExpression.Parse(- cronExpression,- includeSeconds ? CronFormat.IncludeSeconds : CronFormat.Standard);-- Guard.IsNotNull(expression, nameof(expression));-- // Attempt to generate next schedules- DateTimeOffset? nextOccurrence = expression.GetNextOccurrence(DateTimeOffset.Now, TimeZoneInfo.Local, true);- var output = new List<string>();- int i = 0;- while (i < maxScheduleCount && nextOccurrence.HasValue)- {- output.Add(nextOccurrence.Value.ToString(dateFormat));- nextOccurrence = expression.GetNextOccurrence(nextOccurrence.Value, TimeZoneInfo.Local, false);- i++;- }-- schedule = string.Join(Environment.NewLine, output);- error = string.Empty;- return true;- }- catch- {- schedule = string.Empty;- description = string.Empty;- error = CronParser.CronErrorMessage;- return false;- }- }-- private static bool ValidateDateTimeFormat(string dateFormat)- {- try- {- string s = DateTime.Now.ToString(dateFormat, CultureInfo.InvariantCulture);- DateTime.Parse(s, CultureInfo.InvariantCulture);- return true;- }- catch- {- return false;- }- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/DateHelper.cs b/src/app/dev/DevToys.Tools/Helpers/DateHelper.csdeleted file mode 100644index 81fc43058..000000000--- a/src/app/dev/DevToys.Tools/Helpers/DateHelper.cs+++ /dev/null@@ -1,85 +0,0 @@-using DevToys.Tools.Models;--namespace DevToys.Tools.Helpers;--internal static class DateHelper-{- private static readonly DateTimeOffset minimumZoneOffsetTimestamp = DateTimeOffset.MinValue;-- private static readonly DateTimeOffset maximumZoneOffsetTimestamp = DateTimeOffset.MaxValue;-- internal static bool IsValidTimestamp(long value)- {- if (value < minimumZoneOffsetTimestamp.Millisecond || value > maximumZoneOffsetTimestamp.Millisecond)- return false;- return true;- }-- internal static ResultInfo<DateTimeOffset> ConvertToDateTimeUtc(- long value,- DateTimeOffset currentEpoch,- DateFormat format)- {- DateTimeOffset conversionResult = format switch- {- DateFormat.Ticks => new DateTime(value, DateTimeKind.Utc),- DateFormat.Seconds => currentEpoch.AddSeconds(value),- DateFormat.Milliseconds => currentEpoch.AddMilliseconds(value),- _ => throw new NotSupportedException(""),- };-- return new(conversionResult, true);- }-- internal static ResultInfo<long> ConvertToLong(- DateTimeOffset value,- DateTimeOffset epoch,- DateFormat format)- {- DateTimeOffset dateTimeOffsetUtc = TimeZoneInfo.ConvertTime(value, TimeZoneInfo.Utc);- TimeSpan elapsedTime = dateTimeOffsetUtc - epoch;- long result = format switch- {- DateFormat.Ticks => dateTimeOffsetUtc.Ticks,- DateFormat.Seconds => (long)elapsedTime.TotalSeconds,- DateFormat.Milliseconds => (long)elapsedTime.TotalMilliseconds,- _ => throw new NotSupportedException(""),- };- return new(result);- }-- internal static ResultInfo<DateTimeOffset> ChangeDateTime(- int value,- DateTimeOffset target,- TimeZoneInfo timeZoneInfo,- DateValueType valueChanged)- {- target = TimeZoneInfo.ConvertTime(target, timeZoneInfo);- DateTimeOffset result = valueChanged switch- {- DateValueType.Year => ChangeYear(target, value),- DateValueType.Month => target.AddMonths(value - target.Month),- DateValueType.Day => target.AddDays(value - target.Day),- DateValueType.Hour => target.AddHours(value - target.Hour),- DateValueType.Minute => target.AddMinutes(value - target.Minute),- DateValueType.Second => target.AddSeconds(value - target.Second),- DateValueType.Millisecond => target.AddMilliseconds(value - target.Millisecond),- _ => throw new NotImplementedException(),- };- return new(result, true);- }-- private static DateTimeOffset ChangeYear(DateTimeOffset target, int value)- {- if (value <= 0)- {- return DateTimeOffset.UtcNow;- }-- if (!DateTime.IsLeapYear(value) && target.Month == 2 && target.Day > 28)- {- target.AddDays(value - target.Day);- }- return target.AddYears(value - target.Year);- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/FileHelper.cs b/src/app/dev/DevToys.Tools/Helpers/FileHelper.csdeleted file mode 100644index 09a7e5e3a..000000000--- a/src/app/dev/DevToys.Tools/Helpers/FileHelper.cs+++ /dev/null@@ -1,18 +0,0 @@-namespace DevToys.Tools.Helpers;-internal static class FileHelper-{- /// <summary>- /// Writes the output to the output file path if provided, otherwise to the console- /// </summary>- internal static async Task WriteOutputAsync(string? output, FileInfo? outputFile, CancellationToken cancellationToken)- {- if (outputFile is null)- {- Console.WriteLine(output);- }- else- {- await File.WriteAllTextAsync(outputFile.FullName, output, cancellationToken);- }- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/GZipHelper.cs b/src/app/dev/DevToys.Tools/Helpers/GZipHelper.csdeleted file mode 100644index 6e6fe987c..000000000--- a/src/app/dev/DevToys.Tools/Helpers/GZipHelper.cs+++ /dev/null@@ -1,147 +0,0 @@-using System.Buffers;-using System.Buffers.Text;-using System.IO.Compression;-using System.Text;-using DevToys.Tools.Tools.EncodersDecoders.GZip;-using Microsoft.Extensions.Logging;-using Microsoft.IO;--namespace DevToys.Tools.Helpers;--internal static partial class GZipHelper-{- private static readonly RecyclableMemoryStreamManager streamManager = new();-- internal static bool IsGZip(string? input)- {- ReadOnlySpan<char> trimmedInput = input.AsSpan().TrimStart();-- return trimmedInput is ['H', '4', 's', 'I', ..];- }-- internal static async Task<(string compressedData, double compressionPercentage)> CompressOrDecompressAsync(- string? input,- CompressionMode compressionMode,- ILogger logger,- CancellationToken cancellationToken)- {- (string, double) conversionResult = compressionMode switch- {- CompressionMode.Compress => await CompressGZipDataAsync(input, logger, cancellationToken),- CompressionMode.Decompress => await DecompressGZipDataAsync(input, logger, cancellationToken),- _ => throw new NotSupportedException(),- };- cancellationToken.ThrowIfCancellationRequested();-- return conversionResult;- }-- internal static async Task<(string compressedData, double compressionPercentage)> CompressGZipDataAsync(string? data, ILogger logger, CancellationToken cancellationToken)- {- if (data is null)- {- return (string.Empty, 0);- }-- byte[]? inputBytes = null;- string compressed = string.Empty;-- try- {- inputBytes = ArrayPool<byte>.Shared.Rent(Encoding.UTF8.GetByteCount(data));- int bytesWritten = Encoding.UTF8.GetBytes(data, inputBytes);-- using RecyclableMemoryStream outputStream = streamManager.GetStream();- using (var gZipStream = new GZipStream(outputStream, CompressionMode.Compress, leaveOpen: true))- {- await gZipStream.WriteAsync(inputBytes.AsMemory(0, bytesWritten), cancellationToken);- }-- compressed = Convert.ToBase64String(outputStream.GetBuffer().AsSpan(0, (int)outputStream.Length));- cancellationToken.ThrowIfCancellationRequested();- }- catch (OperationCanceledException)- {- // ignore;- }- catch (Exception ex)- {- LogFailCompressGZip(logger, ex);- return (ex.Message, 0);- }- finally- {- if (inputBytes is not null)- {- ArrayPool<byte>.Shared.Return(inputBytes);- }- }-- int difference = data.Length - compressed.Length;- double percentageDifference = (double)difference / data.Length * 100;-- return (compressed, percentageDifference);- }-- internal static async Task<(string decompressedData, double compressionPercentage)> DecompressGZipDataAsync(string? compressedData, ILogger logger, CancellationToken cancellationToken)- {- if (compressedData is null)- {- return (string.Empty, 0);- }-- byte[]? inputBytes = null;- string decompressed = string.Empty;-- try- {- inputBytes = ArrayPool<byte>.Shared.Rent(Encoding.UTF8.GetByteCount(compressedData));- int bytesWritten = Encoding.UTF8.GetBytes(compressedData, inputBytes);-- OperationStatus operationStatus = Base64.DecodeFromUtf8InPlace(inputBytes.AsSpan(0, bytesWritten), out bytesWritten);-- if (operationStatus is not OperationStatus.Done)- return (GZipEncoderDecoder.InvalidGZipData, 0);-- using var inputStream = new MemoryStream(inputBytes);- using var gZipStream = new GZipStream(inputStream, CompressionMode.Decompress);- using var streamReader = new StreamReader(gZipStream);- decompressed = await streamReader.ReadToEndAsync(cancellationToken); // TODO: Perf risk. Read in chunks.- cancellationToken.ThrowIfCancellationRequested();- }- catch (OperationCanceledException)- {- // ignore;- }- catch (FormatException)- {- return (GZipEncoderDecoder.InvalidGZipData, 0);- }- catch (Exception ex)- {- LogFailDecompressGZip(logger, ex);- return (GZipEncoderDecoder.InvalidGZipData, 0);- }- finally- {- if (inputBytes is not null)- {- ArrayPool<byte>.Shared.Return(inputBytes);- }- }-- int difference = decompressed.Length - compressedData.Length;- double percentageDifference = (double)difference / decompressed.Length * 100;- return (decompressed, percentageDifference);- }-- private static void LogFailCompressGZip(ILogger logger, Exception exception)- {- logger.LogError(0, exception, $"Failed to compress text to GZip.");- }-- private static void LogFailDecompressGZip(ILogger logger, Exception exception)- {- logger.LogError(1, exception, $"Failed to decompress GZip.");- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/HashingHelper.cs b/src/app/dev/DevToys.Tools/Helpers/HashingHelper.csdeleted file mode 100644index 96a850d7b..000000000--- a/src/app/dev/DevToys.Tools/Helpers/HashingHelper.cs+++ /dev/null@@ -1,114 +0,0 @@-using System.Security.Authentication;-using System.Security.Cryptography;-using System.Text;-using DevToys.Tools.Models;--namespace DevToys.Tools.Helpers;--internal static class HashingHelper-{- internal static async Task<string> ComputeHashAsync(- HashAlgorithmType hashAlgorithm,- Stream inputStream,- string? hmacSecretKey,- Action<HashingProgress>? progressCallback,- CancellationToken cancellationToken)- {- Guard.IsNotNull(inputStream);- Guard.IsNotEqualTo((int)HashAlgorithmType.None, (int)hashAlgorithm);-- using HashAlgorithm? algorithm = CreateHashAlgorithm(hashAlgorithm, hmacSecretKey);-- byte[]? fileHash- = await ComputeHashAsync(- algorithm,- inputStream,- progressCallback == null ? null : new Progress<HashingProgress>(progressCallback),- cancellationToken);-- string? fileHashString- = BitConverter- .ToString(fileHash)- .Replace("-", string.Empty);-- return fileHashString;- }-- internal static async Task<byte[]> ComputeHashAsync(- HashAlgorithm hashAlgorithm,- Stream stream,- IProgress<HashingProgress>? progressCallback,- CancellationToken cancellationToken,- int bufferSize = 1024 * 1024)- {- Guard.IsNotNull(stream, nameof(stream));- Guard.IsNotNull(hashAlgorithm, nameof(hashAlgorithm));-- byte[] buffer = new byte[bufferSize];-- if (stream.Length == 0)- {- return hashAlgorithm.ComputeHash(Array.Empty<byte>());- }-- long totalBytesRead = 0;-- int bytesRead;- while ((bytesRead = await stream.ReadAsync(buffer, cancellationToken)) != 0)- {- hashAlgorithm.TransformBlock(buffer, 0, bytesRead, buffer, 0);- totalBytesRead += bytesRead;- ProgressAndCancellation();- }-- hashAlgorithm.TransformFinalBlock(buffer, 0, bytesRead);- ProgressAndCancellation();-- return hashAlgorithm.Hash ?? hashAlgorithm.ComputeHash(Array.Empty<byte>());-- void ProgressAndCancellation()- {- progressCallback?.Report(new HashingProgress(stream.Length, totalBytesRead, cancellationToken));- cancellationToken.ThrowIfCancellationRequested();- }- }-- private static HashAlgorithm CreateHashAlgorithm(HashAlgorithmType hashingAlgorithm, string? hmacSecretKey)- {- if (string.IsNullOrEmpty(hmacSecretKey))- {- return CreateHashAlgorithm(hashingAlgorithm);- }- else- {- return CreateHmacAlgorithm(hashingAlgorithm, hmacSecretKey);- }- }-- private static HashAlgorithm CreateHashAlgorithm(HashAlgorithmType hashingAlgorithm)- {- return hashingAlgorithm switch- {- HashAlgorithmType.Md5 => MD5.Create(),- HashAlgorithmType.Sha1 => SHA1.Create(),- HashAlgorithmType.Sha256 => SHA256.Create(),- HashAlgorithmType.Sha384 => SHA384.Create(),- HashAlgorithmType.Sha512 => SHA512.Create(),- _ => throw new ArgumentException("Hash Algorithm not supported", nameof(hashingAlgorithm))- };- }-- private static HashAlgorithm CreateHmacAlgorithm(HashAlgorithmType hashingAlgorithm, string hmacSecretKey)- {- byte[] key = Encoding.UTF8.GetBytes(hmacSecretKey);- return hashingAlgorithm switch- {- HashAlgorithmType.Md5 => new HMACMD5(key),- HashAlgorithmType.Sha1 => new HMACSHA1(key),- HashAlgorithmType.Sha256 => new HMACSHA256(key),- HashAlgorithmType.Sha384 => new HMACSHA384(key),- HashAlgorithmType.Sha512 => new HMACSHA512(key),- _ => throw new ArgumentException("Hash Algorithm not supported", nameof(hashingAlgorithm))- };- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/HtmlHelper.cs b/src/app/dev/DevToys.Tools/Helpers/HtmlHelper.csdeleted file mode 100644index 4affa1cb7..000000000--- a/src/app/dev/DevToys.Tools/Helpers/HtmlHelper.cs+++ /dev/null@@ -1,96 +0,0 @@-using System.Web;-using DevToys.Tools.Models;-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.Helpers;--internal static partial class HtmlHelper-{- internal static string EncodeOrDecode(string? input, EncodingConversion conversionMode, ILogger logger, CancellationToken cancellationToken)- {- string conversionResult- = conversionMode switch- {- EncodingConversion.Encode- => EncodeHtmlData(- input,- logger,- cancellationToken),-- EncodingConversion.Decode- => DecodeHtmlData(- input,- logger,- cancellationToken),-- _ => throw new NotSupportedException(),- };-- cancellationToken.ThrowIfCancellationRequested();-- return conversionResult;- }-- internal static string EncodeHtmlData(string? data, ILogger logger, CancellationToken cancellationToken)- {- if (string.IsNullOrWhiteSpace(data))- {- return string.Empty;- }-- string encoded = string.Empty;- try- {- encoded = HttpUtility.HtmlEncode(data);- cancellationToken.ThrowIfCancellationRequested();- }- catch (OperationCanceledException)- {- // ignore;- }- catch (Exception ex)- {- LogFailEncodeHtml(logger, ex);- return ex.Message;- }-- return encoded;- }-- internal static string DecodeHtmlData(string? data, ILogger logger, CancellationToken cancellationToken)- {- if (string.IsNullOrWhiteSpace(data))- {- return string.Empty;- }-- string? decoded = string.Empty;-- try- {- decoded = HttpUtility.HtmlDecode(data);- cancellationToken.ThrowIfCancellationRequested();- }- catch (Exception ex) when (ex is OperationCanceledException || ex is FormatException)- {- // ignore;- }- catch (Exception ex)- {- LogFailDecodeHtml(logger, ex);- return ex.Message;- }-- return decoded;- }-- private static void LogFailEncodeHtml(ILogger logger, Exception exception)- {- logger.LogError(0, exception, $"Failed to encode text to Html.");- }-- private static void LogFailDecodeHtml(ILogger logger, Exception exception)- {- logger.LogError(1, exception, $"Failed to decode Html.");- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/ImageHelper.cs b/src/app/dev/DevToys.Tools/Helpers/ImageHelper.csdeleted file mode 100644index 9ce99611c..000000000--- a/src/app/dev/DevToys.Tools/Helpers/ImageHelper.cs+++ /dev/null@@ -1,51 +0,0 @@-using DevToys.Tools.Models;-using SixLabors.ImageSharp;-using SixLabors.ImageSharp.Formats;-using SixLabors.ImageSharp.Formats.Bmp;-using SixLabors.ImageSharp.Formats.Jpeg;-using SixLabors.ImageSharp.Formats.Pbm;-using SixLabors.ImageSharp.Formats.Png;-using SixLabors.ImageSharp.Formats.Tga;-using SixLabors.ImageSharp.Formats.Tiff;-using SixLabors.ImageSharp.Formats.Webp;-using SixLabors.ImageSharp.PixelFormats;--namespace DevToys.Tools.Helpers;--internal static class ImageHelper-{- internal static Task SaveAsync(Stream destinationStream, Image<Rgba32> image, ImageConverterSupportedFormat format, CancellationToken cancellationToken)- {- IImageFormat? imageFormat- = format switch- {- ImageConverterSupportedFormat.BMP => BmpFormat.Instance,- ImageConverterSupportedFormat.JPEG => JpegFormat.Instance,- ImageConverterSupportedFormat.PBM => PbmFormat.Instance,- ImageConverterSupportedFormat.PNG => PngFormat.Instance,- ImageConverterSupportedFormat.TGA => TgaFormat.Instance,- ImageConverterSupportedFormat.TIFF => TiffFormat.Instance,- ImageConverterSupportedFormat.WEBP => WebpFormat.Instance,- _ => null,- };-- if (imageFormat is null)- {- ThrowHelper.ThrowNotSupportedException();- }-- return image.SaveAsync(destinationStream, imageFormat, cancellationToken);- }-- internal static async Task<Image<Rgba32>> LoadImageFromFileAsync(FileInfo file, CancellationToken cancellationToken)- {- using Stream inputFileStream = file.OpenRead();- return await Image.LoadAsync<Rgba32>(inputFileStream, cancellationToken);- }-- internal static async Task<Image<Rgba32>> LoadImageFromFileAsync(SandboxedFileReader file, CancellationToken cancellationToken)- {- using Stream inputFileStream = await file.GetNewAccessToFileContentAsync(cancellationToken);- return await Image.LoadAsync<Rgba32>(inputFileStream, cancellationToken);- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/JsonHelper.cs b/src/app/dev/DevToys.Tools/Helpers/JsonHelper.csdeleted file mode 100644index c8cddb9bf..000000000--- a/src/app/dev/DevToys.Tools/Helpers/JsonHelper.cs+++ /dev/null@@ -1,310 +0,0 @@-using System.Text;-using DevToys.Tools.Helpers.Core;-using DevToys.Tools.Models;-using Microsoft.Extensions.Logging;-using Newtonsoft.Json;-using Newtonsoft.Json.Linq;-using YamlDotNet.Core;-using YamlDotNet.Serialization;--namespace DevToys.Tools.Helpers;--internal static partial class JsonHelper-{- /// <summary>- /// Detects whether the given string is a valid JSON or not.- /// </summary>- internal static async ValueTask<bool> IsValidAsync(string? input, ILogger logger, CancellationToken cancellationToken)- {- if (input == null)- {- return true;- }-- if (long.TryParse(input, out _))- {- return false;- }-- try- {- using JsonReader reader = new JsonTextReader(new StringReader(input));- JToken? jtoken = await JToken.LoadAsync(reader, settings: null, cancellationToken);- return jtoken is not null;- }- catch (JsonReaderException)- {- // Exception in parsing json. It likely mean the text isn't a JSON.- return false;- }- catch (Exception ex)- {- logger.LogError(ex, "Invalid data detected.");- return false;- }- }-- /// <summary>- /// Format a string to the specified JSON format.- /// </summary>- internal static async Task<ResultInfo<string>> FormatAsync(- string? input,- Indentation indentationMode,- bool sortProperties,- ILogger logger,- CancellationToken cancellationToken)- {- if (string.IsNullOrWhiteSpace(input))- {- return new(string.Empty, false);- }-- try- {- var jsonLoadSettings = new JsonLoadSettings()- {- CommentHandling = CommentHandling.Ignore,- DuplicatePropertyNameHandling = DuplicatePropertyNameHandling.Ignore,- LineInfoHandling = LineInfoHandling.Load- };-- JToken jToken;- using (var jsonReader = new JsonTextReader(new StringReader(input)))- {- jsonReader.DateParseHandling = DateParseHandling.None;- jsonReader.DateTimeZoneHandling = DateTimeZoneHandling.RoundtripKind;-- jToken = await JToken.LoadAsync(jsonReader, jsonLoadSettings, cancellationToken);- }-- if (sortProperties)- {- if (jToken is JObject obj)- {- SortJsonPropertiesAlphabetically(obj);- }- else if (jToken is JArray array)- {- SortJsonPropertiesAlphabetically(array);- }- }-- var stringBuilder = new StringBuilder();- using (var stringWriter = new StringWriter(stringBuilder))- using (var jsonTextWriter = new JsonTextWriter(stringWriter))- {- switch (indentationMode)- {- case Indentation.TwoSpaces:- jsonTextWriter.Formatting = Formatting.Indented;- jsonTextWriter.IndentChar = ' ';- jsonTextWriter.Indentation = 2;- break;- case Indentation.FourSpaces:- jsonTextWriter.Formatting = Formatting.Indented;- jsonTextWriter.IndentChar = ' ';- jsonTextWriter.Indentation = 4;- break;- case Indentation.OneTab:- jsonTextWriter.Formatting = Formatting.Indented;- jsonTextWriter.IndentChar = '\t';- jsonTextWriter.Indentation = 1;- break;- case Indentation.Minified:- jsonTextWriter.Formatting = Formatting.None;- break;- default:- throw new NotSupportedException();- }-- jsonTextWriter.DateFormatHandling = DateFormatHandling.IsoDateFormat;- jsonTextWriter.DateTimeZoneHandling = DateTimeZoneHandling.RoundtripKind;-- jToken.WriteTo(jsonTextWriter);- }-- return new(stringBuilder.ToString());- }- catch (JsonReaderException ex)- {- return new(ex.Message, false);- }- catch (Exception ex)- {- logger.LogError(ex, "Invalid JSON format '{indentationMode}'", indentationMode);- return new(ex.Message, false);- }- }-- /// <summary>- /// Get the data of a JSON object in the given JSONPath.- /// </summary>- internal static async Task<ResultInfo<string>> TestJsonPathAsync(string json, string jsonPath, ILogger logger, CancellationToken cancellationToken)- {- if (string.IsNullOrEmpty(json) || string.IsNullOrEmpty(jsonPath))- {- return new(string.Empty, false);- }-- try- {- using JsonReader reader = new JsonTextReader(new StringReader(json));- JObject? jsonObject = await JObject.LoadAsync(reader, settings: null, cancellationToken);- return TestJsonPath(jsonObject, jsonPath, logger, cancellationToken);- }- catch (Exception ex) when (ex is OperationCanceledException or JsonReaderException)- {- return new(ex.Message, false);- }- catch (Exception ex)- {- logger.LogError(ex, "Error while testing JsonPath.");- return new(ex.Message, false);- }- }-- /// <summary>- /// Get the data of a JSON object in the given JSONPath.- /// </summary>- internal static ResultInfo<string> TestJsonPath(JObject jsonObject, string jsonPath, ILogger logger, CancellationToken cancellationToken)- {- Guard.IsNotNull(logger);- if (jsonObject is null || string.IsNullOrWhiteSpace(jsonPath))- {- return new(string.Empty, false);- }-- try- {- IEnumerable<JToken> tokens = jsonObject.SelectTokens(jsonPath, errorWhenNoMatch: false);-- cancellationToken.ThrowIfCancellationRequested();- return new(JsonConvert.SerializeObject(tokens, Formatting.Indented), true);- }- catch (OperationCanceledException)- {- return new(string.Empty, false);- }- catch (Exception ex)- {- logger.LogError(ex, "Error while testing JsonPath.");- return new(ex.Message, false);- }- }-- /// <summary>- /// Convert a Yaml string to Json- /// </summary>- internal static ResultInfo<string> ConvertFromYaml(- string? input,- Indentation indentationMode,- ILogger logger,- CancellationToken cancellationToken)- {- if (string.IsNullOrWhiteSpace(input))- {- return new(string.Empty, false);- }-- try- {- using var stringReader = new StringReader(input);-- IDeserializer deserializer = new DeserializerBuilder()- .WithNodeTypeResolver(new DecimalYamlTypeResolver())- .WithNodeTypeResolver(new BooleanYamlTypeResolver())- .Build();-- object? yamlObject = deserializer.Deserialize(stringReader);-- if (yamlObject is null or string)- {- return new(string.Empty, false);- }-- var stringBuilder = new StringBuilder();- using (var stringWriter = new StringWriter(stringBuilder))- using (var jsonTextWriter = new JsonTextWriter(stringWriter))- {- switch (indentationMode)- {- case Indentation.TwoSpaces:- jsonTextWriter.Formatting = Formatting.Indented;- jsonTextWriter.IndentChar = ' ';- jsonTextWriter.Indentation = 2;- break;-- case Indentation.FourSpaces:- jsonTextWriter.Formatting = Formatting.Indented;- jsonTextWriter.IndentChar = ' ';- jsonTextWriter.Indentation = 4;- break;-- default:- throw new NotSupportedException();- }-- var jsonSerializer = JsonSerializer.CreateDefault(new JsonSerializerSettings()- {- Converters = { new DecimalJsonConverter() }- });- jsonSerializer.Serialize(jsonTextWriter, yamlObject);- }-- cancellationToken.ThrowIfCancellationRequested();- return new(stringBuilder.ToString());-- }- catch (SemanticErrorException ex)- {- return new(ex.Message, false);- }- catch (OperationCanceledException)- {- return new(string.Empty, false);- }- catch (Exception ex)- {- logger.LogError(ex, "Yaml to Json Converter");- return new(string.Empty, false);- }- }-- private static void SortJsonPropertiesAlphabetically(JObject jObject)- {- var properties = jObject.Properties().ToList();- foreach (JProperty? property in properties)- {- property.Remove();- }-- foreach (JProperty? property in properties.OrderBy(p => p.Name))- {- jObject.Add(property);- if (property.Value is JObject obj)- {- SortJsonPropertiesAlphabetically(obj);- }- else if (property.Value is JArray array)- {- SortJsonPropertiesAlphabetically(array);- }- }- }-- private static void SortJsonPropertiesAlphabetically(JArray jArray)- {- foreach (JToken? arrayItem in jArray)- {- if (arrayItem is JObject arrayObj)- {- SortJsonPropertiesAlphabetically(arrayObj);- }- else if (arrayItem is JArray array)- {- SortJsonPropertiesAlphabetically(array);- }- }- }-}-diff --git a/src/app/dev/DevToys.Tools/Helpers/JsonTableHelper.cs b/src/app/dev/DevToys.Tools/Helpers/JsonTableHelper.csdeleted file mode 100644index 460fae8e6..000000000--- a/src/app/dev/DevToys.Tools/Helpers/JsonTableHelper.cs+++ /dev/null@@ -1,137 +0,0 @@-using System.Data;-using System.Text;-using Newtonsoft.Json;-using Newtonsoft.Json.Linq;--namespace DevToys.Tools.Helpers;--internal static class JsonTableHelper-{- internal static ConvertResult ConvertFromJson(string? text, CopyFormat? format, CancellationToken cancellationToken)- {- JObject[]? array = ParseJsonArray(text);- if (array == null)- {- return new(null, "", ConvertResultError.NotJsonArray);- }-- JObject[] flattened = array.Select(o => FlattenJsonObject(o)).ToArray();-- string[] properties = flattened- .SelectMany(o => o.Properties())- .Select(p => p.Name)- .Distinct()- .ToArray();-- if (properties.Length == 0)- {- return new(null, "", ConvertResultError.NoProperties);- }-- var table = new DataGridContents(properties, new());-- StringBuilder? clipboard = null;- char separator = '\0';- if (format.HasValue)- {- separator = format switch- {- CopyFormat.TSV => '\t',- CopyFormat.CSV => ',',- CopyFormat.FSV => ';',- _ => throw new NotSupportedException($"Unhandled {nameof(CopyFormat)}: {format}"),- };- clipboard = new StringBuilder();- clipboard.AppendLine(string.Join(separator, properties));- }-- foreach (JObject obj in flattened)- {- cancellationToken.ThrowIfCancellationRequested();-- string[] values = properties- .Select(p => obj[p]?.ToString() ?? "") // JObject indexer conveniently returns null for unknown properties- .ToArray();-- table.Rows.Add(values);-- if (format.HasValue)- {- clipboard!.AppendLine(string.Join(separator, values));- }- }-- return new(table, clipboard?.ToString() ?? string.Empty, ConvertResultError.None);- }-- internal record ConvertResult(DataGridContents? Data, string Text, ConvertResultError Error);-- internal record DataGridContents(string[] Headings, List<string[]> Rows);-- internal enum ConvertResultError { None, NotJsonArray, NoProperties }-- internal enum CopyFormat- {- /// <summary>- /// Tab separated values- /// </summary>- TSV,-- /// <summary>- /// Comma separated values- /// </summary>- CSV,-- /// <summary>- /// Semicolon separated values (CSV French)- /// </summary>- FSV,- }-- /// <summary>- /// Parse the text to an array of JObject, or null if the text does not represent a JSON array of objects.- /// </summary>- /// <param name="text"></param>- /// <returns></returns>- private static JObject[]? ParseJsonArray(string? text)- {- try- {- // Coalesce to empty string to prevent ArgumentNullException (returns null instead).- var array = JsonConvert.DeserializeObject(text ?? "") as JArray;- return array?.Cast<JObject>().ToArray();- }- catch (JsonException)- {- return null;- }- catch (InvalidCastException)- {- return null;- }- }-- internal static JObject FlattenJsonObject(JObject json)- {- var flattened = new JObject();-- foreach (KeyValuePair<string, JToken?> kv in json)- {- if (kv.Value is JObject jobj)- {- // Flatten objects by prefixing their property names with the parent property name, underscore separated.- foreach (KeyValuePair<string, JToken?> kv2 in FlattenJsonObject(jobj))- {- flattened.Add($"{kv.Key}_{kv2.Key}", kv2.Value);- }- }- else if (kv.Value is JValue)- {- flattened[kv.Key] = kv.Value;- }- // else strip out any array values- }-- return flattened;- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/JsonWebToken/JsonWebTokenDecoderHelper.cs b/src/app/dev/DevToys.Tools/Helpers/JsonWebToken/JsonWebTokenDecoderHelper.csdeleted file mode 100644index 9d00c99b3..000000000--- a/src/app/dev/DevToys.Tools/Helpers/JsonWebToken/JsonWebTokenDecoderHelper.cs+++ /dev/null@@ -1,430 +0,0 @@-using System.Security.Cryptography;-using System.Text;-using DevToys.Tools.Models;-using DevToys.Tools.Models.JwtDecoderEncoder;-using DevToys.Tools.Tools.EncodersDecoders.JsonWebToken;-using Microsoft.Extensions.Logging;-using Microsoft.IdentityModel.Logging;-using Microsoft.IdentityModel.Tokens;--namespace DevToys.Tools.Helpers.JsonWebToken;--using System.Security.Claims;-using Microsoft.IdentityModel.JsonWebTokens;-using YamlDotNet.Core.Tokens;--internal static partial class JsonWebTokenDecoderHelper-{- private static readonly List<string> _dateFields = new() { "exp", "nbf", "iat", "auth_time", "updated_at" };-- public static ResultInfo<JsonWebTokenAlgorithm?> GetTokenAlgorithm(string token, ILogger logger)- {- Guard.IsNotNullOrWhiteSpace(token);- try- {- JsonWebTokenHandler handler = new();- JsonWebToken jsonWebToken = handler.ReadJsonWebToken(token);- if (!Enum.TryParse(jsonWebToken.Alg, out JsonWebTokenAlgorithm jwtAlgorithm))- {- return new ResultInfo<JsonWebTokenAlgorithm?>(null, false);- }- return new ResultInfo<JsonWebTokenAlgorithm?>(jwtAlgorithm, true);- }- catch (Exception ex)- {- logger.LogError(ex, "Invalid token detected");- return new ResultInfo<JsonWebTokenAlgorithm?>(null, false);- }- }-- public static async ValueTask<ResultInfo<JsonWebTokenResult?, ResultInfoSeverity>> DecodeTokenAsync(- DecoderParameters decodeParameters,- TokenParameters tokenParameters,- ILogger logger,- CancellationToken cancellationToken)- {- Guard.IsNotNull(decodeParameters);- Guard.IsNotNull(tokenParameters);- Guard.IsNotNullOrWhiteSpace(tokenParameters.Token);-- var tokenResult = new JsonWebTokenResult();-- try- {- IdentityModelEventSource.ShowPII = true;- JsonWebTokenHandler handler = new();- JsonWebToken jsonWebToken = handler.ReadJsonWebToken(tokenParameters.Token);-- string decodedHeader = Base64Helper.FromBase64ToText(- jsonWebToken.EncodedHeader,- Base64Encoding.Utf8,- logger,- cancellationToken);- ResultInfo<string> headerResult = await JsonHelper.FormatAsync(- decodedHeader,- Indentation.TwoSpaces,- false,- logger,- cancellationToken);- if (!headerResult.HasSucceeded)- {- return new ResultInfo<JsonWebTokenResult?, ResultInfoSeverity>(JsonWebTokenEncoderDecoder.InvalidHeader, ResultInfoSeverity.Error);- }- tokenResult.Header = headerResult.Data;-- string decodedpayload = Base64Helper.FromBase64ToText(- jsonWebToken.EncodedPayload,- Base64Encoding.Utf8,- logger,- cancellationToken);- ResultInfo<string> payloadResult = await JsonHelper.FormatAsync(- decodedpayload,- Indentation.TwoSpaces,- false,- logger,- cancellationToken);- if (!payloadResult.HasSucceeded)- {- return new ResultInfo<JsonWebTokenResult?, ResultInfoSeverity>(JsonWebTokenEncoderDecoder.InvalidPayload, ResultInfoSeverity.Error);- }- tokenResult.Payload = payloadResult.Data;- tokenResult.PayloadClaims = ProcessClaims(payloadResult.Data, jsonWebToken.Claims);-- if (decodeParameters.ValidateSignature)- {- ResultInfo<JsonWebTokenResult, ResultInfoSeverity> signatureValid = await ValidateTokenSignatureAsync(handler, decodeParameters, tokenParameters, tokenResult);- if (signatureValid.Severity == ResultInfoSeverity.Error)- {- return new ResultInfo<JsonWebTokenResult?, ResultInfoSeverity>(signatureValid.ErrorMessage!, signatureValid.Severity);- }- else if (signatureValid.Severity == ResultInfoSeverity.Warning)- {- return new ResultInfo<JsonWebTokenResult?, ResultInfoSeverity>(tokenResult, signatureValid.ErrorMessage!, signatureValid.Severity);- }- }- }- catch (Exception ex)- {- logger.LogError(ex, "Invalid token detected");- return new ResultInfo<JsonWebTokenResult?, ResultInfoSeverity>(ex.Message, ResultInfoSeverity.Error);- }-- return new ResultInfo<JsonWebTokenResult?, ResultInfoSeverity>(tokenResult, ResultInfoSeverity.Success);- }-- /// <summary>- /// Validate the token using the Signing Credentials- /// </summary>- private static async Task<ResultInfo<JsonWebTokenResult, ResultInfoSeverity>> ValidateTokenSignatureAsync(- JsonWebTokenHandler handler,- DecoderParameters decodeParameters,- TokenParameters tokenParameters,- JsonWebTokenResult tokenResult)- {- var validationParameters = new TokenValidationParameters- {- ValidateActor = decodeParameters.ValidateActors,- ValidateLifetime = decodeParameters.ValidateLifetime,- ValidateIssuer = decodeParameters.ValidateIssuers,- ValidateAudience = decodeParameters.ValidateAudiences- };-- if (decodeParameters.ValidateIssuersSigningKey)- {- ResultInfo<SigningCredentials> signingCredentials = GetSigningCredentials(tokenParameters);- if (!signingCredentials.HasSucceeded)- {- return new ResultInfo<JsonWebTokenResult, ResultInfoSeverity>(signingCredentials.ErrorMessage!, ResultInfoSeverity.Error);- }-- validationParameters.ValidateIssuerSigningKey = decodeParameters.ValidateIssuersSigningKey;- validationParameters.IssuerSigningKey = signingCredentials.Data!.Key;- validationParameters.TryAllIssuerSigningKeys = true;- }- else- {- // Create a custom signature validator that does nothing so it always passes in this mode- validationParameters.SignatureValidator = (token, _) => new JsonWebToken(token);- }-- // check if the token issuers are part of the user provided issuers- if (decodeParameters.ValidateIssuers)- {- if (tokenParameters.Issuers.Count == 0)- {- return new ResultInfo<JsonWebTokenResult, ResultInfoSeverity>(JsonWebTokenEncoderDecoder.ValidIssuersEmptyError, ResultInfoSeverity.Error);- }- validationParameters.ValidIssuers = tokenParameters.Issuers;- }-- // check if the token audience are part of the user provided audiences- if (decodeParameters.ValidateAudiences)- {- if (tokenParameters.Audiences.Count == 0)- {- return new ResultInfo<JsonWebTokenResult, ResultInfoSeverity>(JsonWebTokenEncoderDecoder.ValidAudiencesEmptyError, ResultInfoSeverity.Error);- }- validationParameters.ValidAudiences = tokenParameters.Audiences;- }-- try- {- TokenValidationResult validationResult = await handler.ValidateTokenAsync(tokenParameters.Token, validationParameters);- if (!validationResult.IsValid)- {- return new ResultInfo<JsonWebTokenResult, ResultInfoSeverity>(validationResult.Exception.Message, ResultInfoSeverity.Error);- }- tokenResult.Signature = tokenParameters.Signature;- tokenResult.PublicKey = tokenParameters.PublicKey;-- if (!decodeParameters.ValidateActors && !decodeParameters.ValidateLifetime &&- !decodeParameters.ValidateIssuers && !decodeParameters.ValidateAudiences &&- !decodeParameters.ValidateIssuersSigningKey)- {- return new ResultInfo<JsonWebTokenResult, ResultInfoSeverity>(tokenResult, JsonWebTokenEncoderDecoder.TokenNotValidated, ResultInfoSeverity.Warning);- }- return new ResultInfo<JsonWebTokenResult, ResultInfoSeverity>(tokenResult, ResultInfoSeverity.Success);- }- catch (Exception exception)- {- return new ResultInfo<JsonWebTokenResult, ResultInfoSeverity>(exception.Message, ResultInfoSeverity.Error);- }- }-- /// <summary>- /// Get the Signing Credentials depending on the token Algorithm- /// </summary>- private static ResultInfo<SigningCredentials> GetSigningCredentials(- TokenParameters tokenParameters)- {- return tokenParameters.TokenAlgorithm switch- {- JsonWebTokenAlgorithm.HS256 or- JsonWebTokenAlgorithm.HS384 or- JsonWebTokenAlgorithm.HS512 => GetHmacShaSigningCredentials(tokenParameters.Signature, tokenParameters.TokenAlgorithm),- JsonWebTokenAlgorithm.RS256 or- JsonWebTokenAlgorithm.RS384 or- JsonWebTokenAlgorithm.RS512 or- JsonWebTokenAlgorithm.PS256 or- JsonWebTokenAlgorithm.PS384 or- JsonWebTokenAlgorithm.PS512 => GetRsaShaSigningCredentials(tokenParameters.PublicKey, tokenParameters.TokenAlgorithm),- JsonWebTokenAlgorithm.ES256 or- JsonWebTokenAlgorithm.ES384 or- JsonWebTokenAlgorithm.ES512 => GetECDsaSigningCredentials(tokenParameters.PublicKey, tokenParameters.TokenAlgorithm),- _ => throw new NotSupportedException()- };- }-- /// <summary>- /// Generate a Symmetric Security Key using the token signature (base 64 or plain text)- /// </summary>- /// <param name="signature">Token signature</param>- /// <param name="jwtAlgorithm">- /// Supported Algorithm- /// HS256,- /// HS384,- /// HS512- /// </param>- /// <exception cref="NotSupportedException"></exception>- private static ResultInfo<SigningCredentials> GetHmacShaSigningCredentials(- string? signature,- JsonWebTokenAlgorithm jwtAlgorithm)- {- if (string.IsNullOrWhiteSpace(signature))- {- return new ResultInfo<SigningCredentials>(null!, JsonWebTokenEncoderDecoder.InvalidSignature, false);- }-- byte[]? signatureByte;- if (Base64Helper.IsBase64DataStrict(signature))- {- signatureByte = Convert.FromBase64String(signature);- }- else- {- signatureByte = Encoding.UTF8.GetBytes(signature);- }-- SigningCredentials signingCredentials;- switch (jwtAlgorithm)- {- case JsonWebTokenAlgorithm.HS256:- byte[] hs256Key = new HMACSHA256(signatureByte).Key;- var hs256SymmetricSecurityKey = new SymmetricSecurityKey(hs256Key);- signingCredentials = new SigningCredentials(hs256SymmetricSecurityKey, SecurityAlgorithms.HmacSha256Signature);- break;- case JsonWebTokenAlgorithm.HS384:- byte[] hs384Key = new HMACSHA384(signatureByte).Key;- var hs384SymmetricSecurityKey = new SymmetricSecurityKey(hs384Key);- signingCredentials = new SigningCredentials(hs384SymmetricSecurityKey, SecurityAlgorithms.HmacSha384Signature);- break;- case JsonWebTokenAlgorithm.HS512:- byte[] hs512Key = new HMACSHA512(signatureByte).Key;- var hs512SymmetricSecurityKey = new SymmetricSecurityKey(hs512Key);- signingCredentials = new SigningCredentials(hs512SymmetricSecurityKey, SecurityAlgorithms.HmacSha512Signature);- break;- default:- throw new NotSupportedException();- }- return new ResultInfo<SigningCredentials>(signingCredentials);- }-- /// <summary>- /// Build RSA signing credentials using the token public key- /// </summary>- /// <param name="key">Token public key</param>- /// <param name="jwtAlgorithm">- /// Supported Algorithm- /// RS256,- /// RS384,- /// RS512,- /// PS256,- /// PS384,- /// PS512- /// </param>- /// <returns></returns>- /// <exception cref="NotSupportedException"></exception>- private static ResultInfo<SigningCredentials> GetRsaShaSigningCredentials(- string? key,- JsonWebTokenAlgorithm jwtAlgorithm)- {- if (string.IsNullOrWhiteSpace(key))- {- return new ResultInfo<SigningCredentials>(null!, JsonWebTokenEncoderDecoder.InvalidPublicKey, false);- }-- var rsa = RSA.Create();- if (key.StartsWith(JsonWebTokenPemEnumeration.PublicKey.PemStart))- {- byte[] keyBytes = JsonWebTokenPemEnumeration.GetBytes(JsonWebTokenPemEnumeration.PublicKey, key);- rsa.ImportSubjectPublicKeyInfo(keyBytes, out _);- }- else if (key.StartsWith(JsonWebTokenPemEnumeration.RsaPublicKey.PemStart))- {- byte[] keyBytes = JsonWebTokenPemEnumeration.GetBytes(JsonWebTokenPemEnumeration.RsaPublicKey, key);- rsa.ImportRSAPublicKey(keyBytes, out _);- }- else- {- return new ResultInfo<SigningCredentials>(null!, JsonWebTokenEncoderDecoder.PublicKeyNotSupported, false);- }-- SigningCredentials signingCredentials;- switch (jwtAlgorithm)- {- case JsonWebTokenAlgorithm.RS256:- var rs256RsaSecurityKey = new RsaSecurityKey(rsa);- signingCredentials = new SigningCredentials(rs256RsaSecurityKey, SecurityAlgorithms.RsaSha256Signature);- break;- case JsonWebTokenAlgorithm.RS384:- var rs384SymmetricSecurityKey = new RsaSecurityKey(rsa);- signingCredentials = new SigningCredentials(rs384SymmetricSecurityKey, SecurityAlgorithms.RsaSha384Signature);- break;- case JsonWebTokenAlgorithm.RS512:- var rs512SymmetricSecurityKey = new RsaSecurityKey(rsa);- signingCredentials = new SigningCredentials(rs512SymmetricSecurityKey, SecurityAlgorithms.RsaSha512Signature);- break;- case JsonWebTokenAlgorithm.PS256:- var ps256RsaSecurityKey = new RsaSecurityKey(rsa);- signingCredentials = new SigningCredentials(ps256RsaSecurityKey, SecurityAlgorithms.RsaSsaPssSha256Signature);- break;- case JsonWebTokenAlgorithm.PS384:- var ps384SymmetricSecurityKey = new RsaSecurityKey(rsa);- signingCredentials = new SigningCredentials(ps384SymmetricSecurityKey, SecurityAlgorithms.RsaSsaPssSha384Signature);- break;- case JsonWebTokenAlgorithm.PS512:- var ps512SymmetricSecurityKey = new RsaSecurityKey(rsa);- signingCredentials = new SigningCredentials(ps512SymmetricSecurityKey, SecurityAlgorithms.RsaSsaPssSha512Signature);- break;- default:- throw new NotSupportedException();- }- return new ResultInfo<SigningCredentials>(signingCredentials);- }-- /// <summary>- /// Build ECDsa signing credentials using the token public key- /// </summary>- /// <param name="key">Token public key</param>- /// <param name="jwtAlgorithm">- /// Supported Algorithm- /// ES256,- /// ES384,- /// ES512- /// </param>- /// <returns></returns>- /// <exception cref="NotSupportedException"></exception>- private static ResultInfo<SigningCredentials> GetECDsaSigningCredentials(- string? key,- JsonWebTokenAlgorithm jwtAlgorithm)- {- if (string.IsNullOrWhiteSpace(key))- {- return new ResultInfo<SigningCredentials>(null!, JsonWebTokenEncoderDecoder.InvalidPublicKey, false);- }-- ECDsa ecd;- if (OperatingSystem.IsWindows())- {- ecd = ECDsaCng.Create();- }- else- {- ecd = ECDsaOpenSsl.Create();- }-- if (key.StartsWith(JsonWebTokenPemEnumeration.PublicKey.PemStart))- {- byte[] keyBytes = JsonWebTokenPemEnumeration.GetBytes(JsonWebTokenPemEnumeration.PublicKey, key);- ecd.ImportSubjectPublicKeyInfo(keyBytes, out _);- }- else if (key.StartsWith(JsonWebTokenPemEnumeration.ECDPublicKey.PemStart))- {- byte[] keyBytes = JsonWebTokenPemEnumeration.GetBytes(JsonWebTokenPemEnumeration.ECDPublicKey, key);- ecd.ImportECPrivateKey(keyBytes, out _);- }- else- {- return new ResultInfo<SigningCredentials>(null!, JsonWebTokenEncoderDecoder.PublicKeyNotSupported, false);- }-- SigningCredentials signingCredentials;- switch (jwtAlgorithm)- {- case JsonWebTokenAlgorithm.ES256:- var es256RsaSecurityKey = new ECDsaSecurityKey(ecd);- signingCredentials = new SigningCredentials(es256RsaSecurityKey, SecurityAlgorithms.EcdsaSha256Signature);- break;- case JsonWebTokenAlgorithm.ES384:- var es384SymmetricSecurityKey = new ECDsaSecurityKey(ecd);- signingCredentials = new SigningCredentials(es384SymmetricSecurityKey, SecurityAlgorithms.EcdsaSha384Signature);- break;- case JsonWebTokenAlgorithm.ES512:- var es512SymmetricSecurityKey = new ECDsaSecurityKey(ecd);- signingCredentials = new SigningCredentials(es512SymmetricSecurityKey, SecurityAlgorithms.EcdsaSha512Signature);- break;- default:- throw new NotSupportedException();- }- return new ResultInfo<SigningCredentials>(signingCredentials);- }-- private static List<JsonWebTokenClaim> ProcessClaims(ReadOnlySpan<char> data, IEnumerable<Claim> claims)- {- List<JsonWebTokenClaim> processedClaims = new();-- foreach (Claim claim in claims)- {- int claimStartPosition = data.IndexOf(claim.Type);- TextSpan span = new(claimStartPosition, claim.Type.Length);- JsonWebTokenClaim processedClaim = new(claim.Type, claim.Value, span);- if (_dateFields.Contains(claim.Type) && long.TryParse(claim.Value, out long value))- {- processedClaim.Value = $"{DateTimeOffset.FromUnixTimeSeconds(value).ToLocalTime()} ({claim.Value})";- }- processedClaims.Add(processedClaim);- }-- return processedClaims;- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/JsonWebToken/JsonWebTokenEncoderHelper.cs b/src/app/dev/DevToys.Tools/Helpers/JsonWebToken/JsonWebTokenEncoderHelper.csdeleted file mode 100644index f8059790d..000000000--- a/src/app/dev/DevToys.Tools/Helpers/JsonWebToken/JsonWebTokenEncoderHelper.cs+++ /dev/null@@ -1,372 +0,0 @@-using System.Security.Cryptography;-using System.Text;-using System.Text.Json;-using DevToys.Tools.Helpers.Core;-using DevToys.Tools.Models;-using DevToys.Tools.Models.JwtDecoderEncoder;-using DevToys.Tools.Tools.EncodersDecoders.JsonWebToken;-using Microsoft.Extensions.Logging;-using Microsoft.IdentityModel.Logging;-using Microsoft.IdentityModel.Tokens;--namespace DevToys.Tools.Helpers.JsonWebToken;--using Microsoft.IdentityModel.JsonWebTokens;--internal static partial class JsonWebTokenEncoderHelper-{- private static readonly JsonSerializerOptions options = new()- {- Converters = {- new JsonWebTokenPayloadConverter()- }- };-- public static ResultInfo<JsonWebTokenResult?, ResultInfoSeverity> GenerateToken(- EncoderParameters encodeParameters,- TokenParameters tokenParameters,- ILogger logger)- {- Guard.IsNotNull(encodeParameters);- Guard.IsNotNull(tokenParameters);- Guard.IsNotNullOrWhiteSpace(tokenParameters.Payload);-- JsonWebTokenResult tokenResult = new();-- try- {- IdentityModelEventSource.ShowPII = true;- Dictionary<string, object>? payload = JsonSerializer.Deserialize<Dictionary<string, object>>(tokenParameters.Payload!, options);- if (payload is null)- {- //return new ResultInfo<JsonWebTokenResult?, ResultInfoSeverity>(JsonWebTokenEncoderDecoder.ValidIssuersEmptyError, ResultInfoSeverity.Error);- }-- ResultInfo<SigningCredentials> signingCredentials = GetSigningCredentials(tokenParameters);- if (!signingCredentials.HasSucceeded)- {- return new ResultInfo<JsonWebTokenResult?, ResultInfoSeverity>(signingCredentials.ErrorMessage!, ResultInfoSeverity.Error);- }-- var tokenDescriptor = new SecurityTokenDescriptor- {- Claims = payload,- SigningCredentials = signingCredentials.Data,- IssuedAt = DateTime.UtcNow,- Expires = null- };-- if (encodeParameters.HasIssuer)- {- if (tokenParameters.Issuers.Count == 0)- {- return new ResultInfo<JsonWebTokenResult?, ResultInfoSeverity>(JsonWebTokenEncoderDecoder.ValidIssuersEmptyError, ResultInfoSeverity.Error);- }-- tokenDescriptor.Issuer = string.Join(',', tokenParameters.Issuers);-- if (string.IsNullOrWhiteSpace(tokenDescriptor.Issuer))- {- return new ResultInfo<JsonWebTokenResult?, ResultInfoSeverity>(JsonWebTokenEncoderDecoder.ValidIssuersEmptyError, ResultInfoSeverity.Error);- }- }-- if (encodeParameters.HasAudience)- {- if (tokenParameters.Audiences.Count == 0)- {- return new ResultInfo<JsonWebTokenResult?, ResultInfoSeverity>(JsonWebTokenEncoderDecoder.ValidAudiencesEmptyError, ResultInfoSeverity.Error);- }-- tokenDescriptor.Audience = string.Join(',', tokenParameters.Audiences);- if (string.IsNullOrWhiteSpace(tokenDescriptor.Audience))- {- return new ResultInfo<JsonWebTokenResult?, ResultInfoSeverity>(JsonWebTokenEncoderDecoder.ValidAudiencesEmptyError, ResultInfoSeverity.Error);- }- }-- if (encodeParameters.HasExpiration)- {- if (!tokenParameters.ExpirationYear.HasValue || !tokenParameters.ExpirationMonth.HasValue ||- !tokenParameters.ExpirationDay.HasValue || !tokenParameters.ExpirationHour.HasValue ||- !tokenParameters.ExpirationMinute.HasValue)- {- return new ResultInfo<JsonWebTokenResult?, ResultInfoSeverity>(JsonWebTokenEncoderDecoder.InvalidExpiration, ResultInfoSeverity.Error);- }- tokenDescriptor.HandleExpiration(tokenParameters);- }-- var handler = new JsonWebTokenHandler- {- SetDefaultTimesOnTokenCreation = false- };-- if (encodeParameters.HasDefaultTime)- {- handler.SetDefaultTimesOnTokenCreation = true;- tokenDescriptor.Expires = DateTime.UtcNow.AddHours(1);- }- string token = handler.CreateToken(tokenDescriptor);- tokenResult.Token = token;- tokenResult.Payload = tokenParameters.Payload;- }- catch (Exception ex)- {- logger.LogError(ex, "Invalid Payload detected");- return new ResultInfo<JsonWebTokenResult?, ResultInfoSeverity>(ex.Message, ResultInfoSeverity.Error);- }-- return new ResultInfo<JsonWebTokenResult?, ResultInfoSeverity>(tokenResult, ResultInfoSeverity.Success);- }-- /// <summary>- /// Get the Signing Credentials depending on the token Algorithm- /// </summary>- private static ResultInfo<SigningCredentials> GetSigningCredentials(- TokenParameters tokenParameters)- {- return tokenParameters.TokenAlgorithm switch- {- JsonWebTokenAlgorithm.HS256 or- JsonWebTokenAlgorithm.HS384 or- JsonWebTokenAlgorithm.HS512 => GetHmacShaSigningCredentials(tokenParameters.Signature, tokenParameters.TokenAlgorithm),- JsonWebTokenAlgorithm.RS256 or- JsonWebTokenAlgorithm.RS384 or- JsonWebTokenAlgorithm.RS512 or- JsonWebTokenAlgorithm.PS256 or- JsonWebTokenAlgorithm.PS384 or- JsonWebTokenAlgorithm.PS512 => GetRsaShaSigningCredentials(tokenParameters.PrivateKey, tokenParameters.TokenAlgorithm),- JsonWebTokenAlgorithm.ES256 or- JsonWebTokenAlgorithm.ES384 or- JsonWebTokenAlgorithm.ES512 => GetECDsaSigningCredentials(tokenParameters.PrivateKey, tokenParameters.TokenAlgorithm),- _ => throw new NotSupportedException()- };- }-- /// <summary>- /// Generate a Symmetric Security Key using the token signature (base 64 or plain text)- /// </summary>- /// <param name="signature">Token signature</param>- /// <param name="jsonWebTokenAlgorithm">- /// Supported Algorithm- /// HS256,- /// HS384,- /// HS512- /// </param>- /// <exception cref="NotSupportedException"></exception>- private static ResultInfo<SigningCredentials> GetHmacShaSigningCredentials(- string? signature,- JsonWebTokenAlgorithm jsonWebTokenAlgorithm)- {- if (string.IsNullOrWhiteSpace(signature))- {- return new ResultInfo<SigningCredentials>(null!, JsonWebTokenEncoderDecoder.InvalidSignature, false);- }-- byte[]? signatureByte;- if (Base64Helper.IsBase64DataStrict(signature))- {- signatureByte = Convert.FromBase64String(signature);- }- else- {- signatureByte = Encoding.UTF8.GetBytes(signature);- }-- SigningCredentials signingCredentials;- switch (jsonWebTokenAlgorithm)- {- case JsonWebTokenAlgorithm.HS256:- byte[] hs256Key = new HMACSHA256(signatureByte).Key;- var hs256SymmetricSecurityKey = new SymmetricSecurityKey(hs256Key);- signingCredentials = new SigningCredentials(hs256SymmetricSecurityKey, SecurityAlgorithms.HmacSha256);- break;- case JsonWebTokenAlgorithm.HS384:- byte[] hs384Key = new HMACSHA384(signatureByte).Key;- var hs384SymmetricSecurityKey = new SymmetricSecurityKey(hs384Key);- signingCredentials = new SigningCredentials(hs384SymmetricSecurityKey, SecurityAlgorithms.HmacSha384);- break;- case JsonWebTokenAlgorithm.HS512:- byte[] hs512Key = new HMACSHA512(signatureByte).Key;- var hs512SymmetricSecurityKey = new SymmetricSecurityKey(hs512Key);- signingCredentials = new SigningCredentials(hs512SymmetricSecurityKey, SecurityAlgorithms.HmacSha512);- break;- default:- throw new NotSupportedException();- }- return new ResultInfo<SigningCredentials>(signingCredentials);- }-- /// <summary>- /// Build RSA signing credentials using the token private key- /// </summary>- /// <param name="key">Token private key</param>- /// <param name="jsonWebTokenAlgorithm">- /// Supported Algorithm- /// RS256,- /// RS384,- /// RS512,- /// PS256,- /// PS384,- /// PS512- /// </param>- /// <returns></returns>- /// <exception cref="NotSupportedException"></exception>- private static ResultInfo<SigningCredentials> GetRsaShaSigningCredentials(- string? key,- JsonWebTokenAlgorithm jsonWebTokenAlgorithm)- {- if (string.IsNullOrWhiteSpace(key))- {- return new ResultInfo<SigningCredentials>(null!, JsonWebTokenEncoderDecoder.InvalidPrivateKey, false);- }-- var rsa = RSA.Create();- if (key.StartsWith(JsonWebTokenPemEnumeration.PrivateKey.PemStart))- {- byte[] keyBytes = JsonWebTokenPemEnumeration.GetBytes(JsonWebTokenPemEnumeration.PrivateKey, key);- rsa.ImportPkcs8PrivateKey(keyBytes, out _);- }- else if (key.StartsWith(JsonWebTokenPemEnumeration.PrivateKey.PemStart))- {- byte[] keyBytes = JsonWebTokenPemEnumeration.GetBytes(JsonWebTokenPemEnumeration.PrivateKey, key);- rsa.ImportPkcs8PrivateKey(keyBytes, out _);- }- else if (key.StartsWith(JsonWebTokenPemEnumeration.RsaPrivateKey.PemStart))- {- byte[] keyBytes = JsonWebTokenPemEnumeration.GetBytes(JsonWebTokenPemEnumeration.RsaPrivateKey, key);- rsa.ImportRSAPrivateKey(keyBytes, out _);- }- else- {- return new ResultInfo<SigningCredentials>(null!, JsonWebTokenEncoderDecoder.PrivateKeyNotSupported, false);- }-- SigningCredentials signingCredentials;- switch (jsonWebTokenAlgorithm)- {- case JsonWebTokenAlgorithm.RS256:- var rs256RsaSecurityKey = new RsaSecurityKey(rsa);- signingCredentials = new SigningCredentials(rs256RsaSecurityKey, SecurityAlgorithms.RsaSha256Signature);- break;- case JsonWebTokenAlgorithm.RS384:- var rs384SymmetricSecurityKey = new RsaSecurityKey(rsa);- signingCredentials = new SigningCredentials(rs384SymmetricSecurityKey, SecurityAlgorithms.RsaSha384Signature);- break;- case JsonWebTokenAlgorithm.RS512:- var rs512SymmetricSecurityKey = new RsaSecurityKey(rsa);- signingCredentials = new SigningCredentials(rs512SymmetricSecurityKey, SecurityAlgorithms.RsaSha512Signature);- break;- case JsonWebTokenAlgorithm.PS256:- var ps256RsaSecurityKey = new RsaSecurityKey(rsa);- signingCredentials = new SigningCredentials(ps256RsaSecurityKey, SecurityAlgorithms.RsaSsaPssSha256Signature);- break;- case JsonWebTokenAlgorithm.PS384:- var ps384SymmetricSecurityKey = new RsaSecurityKey(rsa);- signingCredentials = new SigningCredentials(ps384SymmetricSecurityKey, SecurityAlgorithms.RsaSsaPssSha384Signature);- break;- case JsonWebTokenAlgorithm.PS512:- var ps512SymmetricSecurityKey = new RsaSecurityKey(rsa);- signingCredentials = new SigningCredentials(ps512SymmetricSecurityKey, SecurityAlgorithms.RsaSsaPssSha512Signature);- break;- default:- throw new NotSupportedException();- }- return new ResultInfo<SigningCredentials>(signingCredentials);- }-- /// <summary>- /// Build ECDsa signing credentials using the token private key- /// </summary>- /// <param name="key">Token public key</param>- /// <param name="jsonWebTokenAlgorithm">- /// Supported Algorithm- /// ES256,- /// ES384,- /// ES512- /// </param>- /// <returns></returns>- /// <exception cref="NotSupportedException"></exception>- private static ResultInfo<SigningCredentials> GetECDsaSigningCredentials(- string? key,- JsonWebTokenAlgorithm jsonWebTokenAlgorithm)- {- if (string.IsNullOrWhiteSpace(key))- {- return new ResultInfo<SigningCredentials>(null!, JsonWebTokenEncoderDecoder.InvalidPrivateKey, false);- }-- ECDsa ecd;- if (OperatingSystem.IsWindows())- {- ecd = ECDsaCng.Create();- }- else- {- ecd = ECDsaOpenSsl.Create();- }-- if (key.StartsWith(JsonWebTokenPemEnumeration.PrivateKey.PemStart))- {- byte[] keyBytes = JsonWebTokenPemEnumeration.GetBytes(JsonWebTokenPemEnumeration.PrivateKey, key);- ecd.ImportPkcs8PrivateKey(keyBytes, out _);- }- else if (key.StartsWith(JsonWebTokenPemEnumeration.ECDPrivateKey.PemStart))- {- byte[] keyBytes = JsonWebTokenPemEnumeration.GetBytes(JsonWebTokenPemEnumeration.ECDPrivateKey, key);- ecd.ImportECPrivateKey(keyBytes, out _);- }- else- {- return new ResultInfo<SigningCredentials>(null!, JsonWebTokenEncoderDecoder.PublicKeyNotSupported, false);- }-- SigningCredentials signingCredentials;- switch (jsonWebTokenAlgorithm)- {- case JsonWebTokenAlgorithm.ES256:- var es256RsaSecurityKey = new ECDsaSecurityKey(ecd);- signingCredentials = new SigningCredentials(es256RsaSecurityKey, SecurityAlgorithms.EcdsaSha256Signature);- break;- case JsonWebTokenAlgorithm.ES384:- var es384SymmetricSecurityKey = new ECDsaSecurityKey(ecd);- signingCredentials = new SigningCredentials(es384SymmetricSecurityKey, SecurityAlgorithms.EcdsaSha384Signature);- break;- case JsonWebTokenAlgorithm.ES512:- var es512SymmetricSecurityKey = new ECDsaSecurityKey(ecd);- signingCredentials = new SigningCredentials(es512SymmetricSecurityKey, SecurityAlgorithms.EcdsaSha512Signature);- break;- default:- throw new NotSupportedException();- }- return new ResultInfo<SigningCredentials>(signingCredentials);- }-- private static void HandleExpiration(- this SecurityTokenDescriptor tokenDescriptor,- TokenParameters tokenParameters)- {- DateTime expirationDate = DateTime.UtcNow;- if (tokenParameters.ExpirationYear.HasValue)- {- expirationDate.AddYears(tokenParameters.ExpirationYear.Value);- }- if (tokenParameters.ExpirationMonth.HasValue)- {- expirationDate.AddYears(tokenParameters.ExpirationMonth.Value);- }- if (tokenParameters.ExpirationDay.HasValue)- {- expirationDate.AddYears(tokenParameters.ExpirationDay.Value);- }- if (tokenParameters.ExpirationHour.HasValue)- {- expirationDate.AddYears(tokenParameters.ExpirationHour.Value);- }- if (tokenParameters.ExpirationMinute.HasValue)- {- expirationDate.AddYears(tokenParameters.ExpirationMinute.Value);- }- tokenDescriptor.Expires = expirationDate;- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/JsonWebToken/JsonWebTokenHelper.cs b/src/app/dev/DevToys.Tools/Helpers/JsonWebToken/JsonWebTokenHelper.csdeleted file mode 100644index dc0c8645d..000000000--- a/src/app/dev/DevToys.Tools/Helpers/JsonWebToken/JsonWebTokenHelper.cs+++ /dev/null@@ -1,46 +0,0 @@-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.Helpers.JsonWebToken;--using Microsoft.IdentityModel.JsonWebTokens;--internal static partial class JsonWebTokenHelper-{- private static readonly string AuthorizationHeader = "Authorization:";- private static readonly string BearerScheme = "Bearer";-- /// <summary>- /// Detects whether the given string is a JWT Token or not.- /// </summary>- internal static bool IsValid(string? input, ILogger logger)- {- if (string.IsNullOrWhiteSpace(input))- {- return false;- }-- input = input!.Trim();-- if (input.StartsWith(AuthorizationHeader))- {- input = input.Remove(0, AuthorizationHeader.Length).Trim();- }-- if (input.StartsWith(BearerScheme))- {- input = input.Remove(0, BearerScheme.Length).Trim();- }-- try- {- JsonWebTokenHandler handler = new();- JsonWebToken jsonWebToken = handler.ReadJsonWebToken(input);- return jsonWebToken is not null;- }- catch (Exception ex) //some other exception- {- logger.LogError(ex, "Invalid data detected '{input}'", input);- return false;- }- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/JsonYamlHelper.cs b/src/app/dev/DevToys.Tools/Helpers/JsonYamlHelper.csdeleted file mode 100644index 40d45e921..000000000--- a/src/app/dev/DevToys.Tools/Helpers/JsonYamlHelper.cs+++ /dev/null@@ -1,44 +0,0 @@-using DevToys.Tools.Models;-using DevToys.Tools.Tools.Converters.JsonYaml;-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.Helpers;--internal static class JsonYamlHelper-{- public static async ValueTask<ResultInfo<string>> ConvertAsync(- string input,- JsonToYamlConversion conversion,- Indentation indentation,- ILogger logger,- CancellationToken cancellationToken)- {- await TaskSchedulerAwaiter.SwitchOffMainThreadAsync(cancellationToken);-- ResultInfo<string> conversionResult;- switch (conversion)- {- case JsonToYamlConversion.JsonToYaml:- conversionResult = YamlHelper.ConvertFromJson(input, indentation, logger, cancellationToken);- if (!conversionResult.HasSucceeded && string.IsNullOrWhiteSpace(conversionResult.Data))- {- cancellationToken.ThrowIfCancellationRequested();- return new(JsonYamlConverter.InvalidJson, false);- }- break;- case JsonToYamlConversion.YamlToJson:- conversionResult = JsonHelper.ConvertFromYaml(input, indentation, logger, cancellationToken);- if (!conversionResult.HasSucceeded && string.IsNullOrWhiteSpace(conversionResult.Data))- {- cancellationToken.ThrowIfCancellationRequested();- return new(JsonYamlConverter.InvalidYaml, false);- }- break;- default:- throw new NotSupportedException();- }-- cancellationToken.ThrowIfCancellationRequested();- return conversionResult;- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/ListCompareHelper.cs b/src/app/dev/DevToys.Tools/Helpers/ListCompareHelper.csdeleted file mode 100644index 2bd408e87..000000000--- a/src/app/dev/DevToys.Tools/Helpers/ListCompareHelper.cs+++ /dev/null@@ -1,102 +0,0 @@-using DevToys.Tools.Helpers.Core;-using DevToys.Tools.Models;-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.Helpers;--internal static partial class ListCompareHelper-{- public static ResultInfo<string> Compare(- string firstList,- string secondList,- bool caseSensitive,- ListComparisonMode comparisonMode,- ILogger logger)- {- try- {- ResultInfo<string> compareResult;- var comparer = new ReadOnlyMemoryEqualityComparer(caseSensitive);-- IEnumerable<ReadOnlyMemory<char>> listA = firstList.AsMemory().ToLines();- IEnumerable<ReadOnlyMemory<char>> listB = secondList.AsMemory().ToLines();-- IEnumerable<ReadOnlyMemory<char>> listCompared = comparisonMode switch- {- ListComparisonMode.AInterB => GetAInterB(listA, listB, comparer),- ListComparisonMode.AUnionB => GetAUnionB(listA, listB, comparer),- ListComparisonMode.AOnly => GetAOnly(listA, listB, comparer),- ListComparisonMode.BOnly => GetBOnly(listA, listB, comparer),- _ => throw new NotSupportedException(),- };-- compareResult = new(string.Join(Environment.NewLine, listCompared), true);- return compareResult;- }- catch (Exception ex)- {- logger.LogError(ex, "Unexpected error");- return new(ex.Message, false);- }- }-- private static IEnumerable<ReadOnlyMemory<char>> GetAInterB(IEnumerable<ReadOnlyMemory<char>> listA, IEnumerable<ReadOnlyMemory<char>> listB, ReadOnlyMemoryEqualityComparer comparer)- {- var setB = new HashSet<ReadOnlyMemory<char>>(listB, comparer);- var uniqueElements = new HashSet<ReadOnlyMemory<char>>(comparer);- foreach (ReadOnlyMemory<char> item in listA)- {- if (setB.Contains(item, comparer))- {- if (uniqueElements.Add(item))- {- yield return item;- }- }- }- }-- private static IEnumerable<ReadOnlyMemory<char>> GetAUnionB(IEnumerable<ReadOnlyMemory<char>> listA, IEnumerable<ReadOnlyMemory<char>> listB, ReadOnlyMemoryEqualityComparer comparer)- {- var uniqueElements = new HashSet<ReadOnlyMemory<char>>(comparer);- foreach (ReadOnlyMemory<char> item in listA.Union(listB))- {- if (uniqueElements.Add(item))- {- yield return item;- }- }- }-- private static IEnumerable<ReadOnlyMemory<char>> GetAOnly(IEnumerable<ReadOnlyMemory<char>> listA, IEnumerable<ReadOnlyMemory<char>> listB, ReadOnlyMemoryEqualityComparer comparer)- {- var setB = new HashSet<ReadOnlyMemory<char>>(listB, comparer);- var uniqueElements = new HashSet<ReadOnlyMemory<char>>(comparer);- foreach (ReadOnlyMemory<char> item in listA)- {- if (!setB.Contains(item, comparer))- {- if (uniqueElements.Add(item))- {- yield return item;- }- }- }- }-- private static IEnumerable<ReadOnlyMemory<char>> GetBOnly(IEnumerable<ReadOnlyMemory<char>> listA, IEnumerable<ReadOnlyMemory<char>> listB, ReadOnlyMemoryEqualityComparer comparer)- {- var setA = new HashSet<ReadOnlyMemory<char>>(listA, comparer);- var uniqueElements = new HashSet<ReadOnlyMemory<char>>(comparer);- foreach (ReadOnlyMemory<char> item in listB)- {- if (!setA.Contains(item, comparer))- {- if (uniqueElements.Add(item))- {- yield return item;- }- }- }- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/LoremIpsum/Features.cs b/src/app/dev/DevToys.Tools/Helpers/LoremIpsum/Features.csdeleted file mode 100644index 485773bc5..000000000--- a/src/app/dev/DevToys.Tools/Helpers/LoremIpsum/Features.cs+++ /dev/null@@ -1,11 +0,0 @@-// Forked from https://github.com/alexcpendleton/NLipsum--namespace DevToys.Tools.Helpers.LoremIpsum;--internal enum Features-{- Paragraphs,- Sentences,- Words,- Characters-}diff --git a/src/app/dev/DevToys.Tools/Helpers/LoremIpsum/FormatStrings.cs b/src/app/dev/DevToys.Tools/Helpers/LoremIpsum/FormatStrings.csdeleted file mode 100644index cc28638c0..000000000--- a/src/app/dev/DevToys.Tools/Helpers/LoremIpsum/FormatStrings.cs+++ /dev/null@@ -1,51 +0,0 @@-// Forked from https://github.com/alexcpendleton/NLipsum--namespace DevToys.Tools.Helpers.LoremIpsum;--/// <summary>-/// Common formatting strings.-/// </summary>-internal static class FormatStrings-{- /// <summary>- /// A string with no formatting.- /// </summary>- internal static string Unformatted => "{0}";-- /// <summary>- /// Formatting strings for Paragraphs.- /// </summary>- internal static class Paragraph- {- /// <summary>- /// An Html paragraph. "<p>Lorem ipsum dolor sit amet</p>"- /// </summary>- public static string Html => "<p>{0}</p>";-- /// <summary>- /// A block of text ending with a new line and/or carriage return (based on Environment).- /// </summary>- public static string LineBreaks => "{0}" + Environment.NewLine + Environment.NewLine;- }-- /// <summary>- /// Formatting strings for Sentences.- /// </summary>- internal static class Sentence- {- /// <summary>- /// A typical sentence ending with a period/full stop. "Lorem ipsum dolor sit amet."- /// </summary>- public static string Phrase => "{0}.";-- /// <summary>- /// A sentence ending with a question mark.. "Lorem ipsum dolor sit amet?"- /// </summary>- public static string Question => "{0}?";-- /// <summary>- /// An sentence ending with an exclamation point/mark. "Lorem ipsum dolor sit amet!"- /// </summary>- public static string Exclamation => "{0}!";- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/LoremIpsum/LipsumGenerator.cs b/src/app/dev/DevToys.Tools/Helpers/LoremIpsum/LipsumGenerator.csdeleted file mode 100644index 2fa127f97..000000000--- a/src/app/dev/DevToys.Tools/Helpers/LoremIpsum/LipsumGenerator.cs+++ /dev/null@@ -1,279 +0,0 @@-// Forked from https://github.com/alexcpendleton/NLipsum--using System.Text;-using System.Text.RegularExpressions;--namespace DevToys.Tools.Helpers.LoremIpsum;--/// <summary>-/// Represents a utility that generates Lipsum from a source.-/// </summary>-internal sealed class LipsumGenerator-{- private const string LoremIpsumStartText = "Lorem ipsum dolor sit amet";-- private readonly LipsumsCorpus _lipsum = LipsumsCorpus.LoremIpsum;- private StringBuilder _lipsumText = new();- private IReadOnlyList<string> _preparedWords = Array.Empty<string>();-- internal LipsumGenerator(LipsumsCorpus lipsum)- {- _lipsum = lipsum;- LipsumText = new StringBuilder(Lipsums.GetText(lipsum));- }-- internal LipsumGenerator(string rawData, bool isXml)- {- /*- * If we're receiving an XML string we need to do some- * parsing to retrieve the lipsum text.- */- LipsumText = isXml ?- LipsumUtilities.GetTextFromRawXml(rawData) : new StringBuilder(rawData);- }-- /// <summary>- /// Gets or sets the text used to generate lipsum.- /// </summary>- internal StringBuilder LipsumText- {- get => _lipsumText;- set- {- _lipsumText = value;- PreparedWords = PrepareWords();- }- }-- /// <summary>- /// Gets the words prepared from the LipsumText.- /// </summary>- internal IReadOnlyList<string> PreparedWords- {- get => _preparedWords;- private set => _preparedWords = value;- }-- /// <summary>- /// Generates 'count' features. The format string will be applied to the feature not the result.- /// </summary>- /// <param name="count">How many features are desired.</param>- /// <param name="feature">The desired feature, such as Paragraph or Sentence.</param>- /// <returns></returns>- internal string GenerateLipsum(int count, Features feature)- {- var results = new StringBuilder();- string[] data;- TextFeature? options = null;- if (feature == Features.Paragraphs)- {- data = GenerateParagraphs(count, FormatStrings.Paragraph.LineBreaks);- }- else if (feature == Features.Sentences)- {- data = GenerateSentences(count, FormatStrings.Sentence.Phrase);- options = Sentence.Medium;- }- else if (feature == Features.Words)- {- data = GenerateWords(count);- options = Word.Medium;- }- else if (feature == Features.Characters)- {- data = GenerateCharacters(count);- }- else- {- throw new NotImplementedException();- }-- int length = data.Length;- for (int i = 0; i < length; i++)- {- results.Append(data[i]);- if (options is not null)- {- results.Append(options.Delimiter);- }- }-- string result = results.ToString();-- // If the user has selected the Lorem Ipsum lipsum, we want to always start the result by "Lorem ipsum dolor sit amet".- if (_lipsum == LipsumsCorpus.LoremIpsum- && (feature == Features.Sentences || feature == Features.Paragraphs))- {- result = ApplyStartWords(LoremIpsumStartText, result);- }-- return result.Trim();- }-- /// <summary>- /// Generates a single string (in an array with only this as an element)- /// by getting the first 'count' characters from LipsumText.- /// </summary>- /// <param name="count"></param>- /// <param name="formatString"></param>- /// <returns></returns>- internal string[] GenerateCharacters(int count)- {- string[] result = new string[1];-- /* This whole method needs some thought.- * Right now it just grabs 'count' amount- * of characters from the beginning of the- * LipsumText. It'd be nice if it could- * generate sentences and then truncate them- * but I can't think of an elegant way to- * do that at the moment. TODO. */-- if (count >= LipsumText.Length)- {- count = LipsumText.Length - 1;- }- char[] chars = LipsumText.ToString().Substring(0, count).ToCharArray();-- result[0] = new string(chars);-- return result;- }-- /// <summary>- /// Generates 'count' medium-sized paragraphs of lipsum text.- /// </summary>- /// <param name="count">The number of paragraphs desired.</param>- /// <param name="formatString">The string used to format the paragraphs. Will not perform formatting if null or empty.</param>- private string[] GenerateParagraphs(int count, string formatString)- {- Paragraph options = Paragraph.Medium;- options.FormatString = formatString;- return GenerateParagraphs(count, options);- }-- /// <summary>- /// Generates 'count' paragraphs of lipsum text.- /// </summary>- /// <param name="count">The number of paragraphs desired.</param>- /// <param name="options">Used to determine the minimum and maximum sentences per paragraphs, and format string if applicable.</param>- /// <returns></returns>- internal string[] GenerateParagraphs(int count, Paragraph options)- {- /*- * TODO: These generate methods could probably be- * refactored into one method that takes a count- * and a TextFeature. */- string[] paragraphs = new string[count];- string[] sentences;- for (int i = 0; i < count; i++)- {- /* Get a random amount of sentences based on the- * min and max from the paragraph options */- sentences = GenerateSentences(LipsumUtilities.- RandomInt((int)options.GetMinimum(), (int)options.GetMaximum()));-- // Shove them all together in sentence fashion.- string joined = string.Join(options.Delimiter, sentences);-- // Format if allowed.- paragraphs[i] = string.IsNullOrEmpty(options.FormatString) ?- joined : options.Format(joined);- }-- return paragraphs;- }-- /// <summary>- /// Generates 'count' sentences of lipsum text, using a Medium length sentence. Will use Phase formatting.- /// </summary>- /// <param name="count">The number of sentences desired.</param>- private string[] GenerateSentences(int count)- {- return GenerateSentences(count, FormatStrings.Sentence.Phrase);- }-- /// <summary>- /// Generates 'count' sentences of lipsum text, using a Medium length sentence.- /// </summary>- /// <param name="count">The number of sentences desired.</param>- /// <param name="formatString">The string used to format the sentences. Will not perform formatting if null or empty.</param>- /// <returns></returns>- private string[] GenerateSentences(int count, string formatString)- {- Sentence options = Sentence.Medium;- options.FormatString = formatString;- return GenerateSentences(count, options);- }-- /// <summary>- /// Generates 'count' sentences of lipsum text.- /// If options.FormatString is not null or empty that string used to format the sentences.- /// </summary>- /// <param name="count">The number of sentences desired.</param>- /// <param name="options">Used to determine the minimum and maximum words per sentence, and format string if applicable.</param>- /// <returns></returns>- internal string[] GenerateSentences(int count, Sentence options)- {- string[] sentences = new string[count];- string[] words;-- for (int i = 0; i < count; i++)- {- /* Get a random amount of words based on the- * min and max from the Sentence options */- words = GenerateWords(LipsumUtilities.- RandomInt((int)options.MinimumWords, (int)options.MaximumWords));-- // Shove them all together in sentence fashion.- string joined = string.Join(options.Delimiter, words);-- // Format if allowed.- sentences[i] = string.IsNullOrEmpty(options.FormatString) ?- joined : options.Format(joined);- }-- return sentences;- }-- /// <summary>- /// Generates the amount of lipsum words.- /// </summary>- /// <param name="count">The amount of words to generate.</param>- /// <returns></returns>- internal string[] GenerateWords(int count)- {- string[] words = new string[count];-- for (int i = 0; i < count; i++)- {- words[i] = LipsumUtilities.RandomElement(PreparedWords);- }-- return words;- }-- /// <summary>- /// Retrieves all of the words in the <see cref="LipsumText"/> as an array.- /// </summary>- /// <returns></returns>- private IReadOnlyList<string> PrepareWords()- {- return LipsumUtilities.RemoveEmptyElements(Regex.Split(LipsumText.ToString(), @"\s"));- }-- private static string ApplyStartWords(string startText, string originalText)- {- if (string.IsNullOrWhiteSpace(startText))- {- return originalText;- }-- char space = ' ';- string[] startTokens = (startText ?? "").Split(space, StringSplitOptions.RemoveEmptyEntries);- string[] endTokens = (originalText ?? "").Split(space, StringSplitOptions.RemoveEmptyEntries);- int wordsNeeded = Math.Min(startTokens.Length, endTokens.Length);-- return string.Join(space, startTokens.Take(wordsNeeded).Concat(endTokens.Skip(wordsNeeded)));- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/LoremIpsum/LipsumUtilities.cs b/src/app/dev/DevToys.Tools/Helpers/LoremIpsum/LipsumUtilities.csdeleted file mode 100644index 229863bff..000000000--- a/src/app/dev/DevToys.Tools/Helpers/LoremIpsum/LipsumUtilities.cs+++ /dev/null@@ -1,92 +0,0 @@-// Forked from https://github.com/alexcpendleton/NLipsum--using System.Text;-using System.Xml.Linq;--namespace DevToys.Tools.Helpers.LoremIpsum;--internal static class LipsumUtilities-{- /// <summary>- /// Reads raw Xml and grabs the <text> node's inner text.- /// </summary>- /// <param name="rawXml">The Xml to be parsed.- /// It should follow the lipsum.dtd but really all it needs- /// a text node as a child of the document element.- /// (<root><text>your lipsum text</text></root>- /// </param>- /// <returns></returns>- internal static StringBuilder GetTextFromRawXml(string rawXml)- {- var text = new StringBuilder();- XDocument data = LoadXmlDocument(rawXml);- Guard.IsNotNull(data.Root);- XElement? textNode = data.Root.Element("text");- if (textNode != null)- {- text.Append(textNode.Value);- }-- return text;- }-- /// <summary>- /// Creates an XDocument from a string.- /// </summary>- /// <param name="rawXml">The Xml from which to load the XDocument</param>- /// <returns></returns>- private static XDocument LoadXmlDocument(string rawXml)- {- var document = XDocument.Parse(rawXml);- return document;- }-- /* Is this the best way to do this?- * It seems smelly to have a static member- * for randoms.- */- private static readonly Random rand = new();-- /// <summary>- /// Get a random integer.- /// </summary>- /// <param name="min">The minimum value.</param>- /// <param name="max">The maximum value.</param>- /// <returns></returns>- internal static int RandomInt(int min, int max)- {- int i = rand.Next(min, max);- return i;- }-- /// <summary>- /// Gets a random element from a string array.- /// </summary>- /// <param name="source">The array from which to retrieve a random element.</param>- /// <returns></returns>- internal static string RandomElement(IReadOnlyList<string> source)- {- return source[RandomInt(0, source.Count - 1)];- }-- /// <summary>- /// Removes empty elements from an array.- /// </summary>- /// <param name="source">The array from which to remove empty items.</param>- /// <returns></returns>- internal static IReadOnlyList<string> RemoveEmptyElements(string[] source)- {- var results = new List<string>();- int length = source.Length;-- for (int i = 0; i < length; i++)- {- if (source[i] != null && source[i].Trim().Length > 0)- {- results.Add(source[i]);- }- }-- return results;- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/LoremIpsum/Lipsums.cs b/src/app/dev/DevToys.Tools/Helpers/LoremIpsum/Lipsums.csdeleted file mode 100644index e6b8b671e..000000000--- a/src/app/dev/DevToys.Tools/Helpers/LoremIpsum/Lipsums.cs+++ /dev/null@@ -1,47 +0,0 @@-// Forked from https://github.com/alexcpendleton/NLipsum--using System.Reflection;--namespace DevToys.Tools.Helpers.LoremIpsum;--/// <summary>-/// All of these Lipsums are derived from the files at http://lipsum.sourceforge.net/-/// </summary>-internal static class Lipsums-{- internal static string GetText(LipsumsCorpus lipsum)- {- return lipsum switch- {- LipsumsCorpus.ChildHarold => GetTextFromRawXml("childharold"),- LipsumsCorpus.Decameron => GetTextFromRawXml("decameron"),- LipsumsCorpus.Faust => GetTextFromRawXml("faust"),- LipsumsCorpus.InDerFremde => GetTextFromRawXml("inderfremde"),- LipsumsCorpus.LeBateauIvre => GetTextFromRawXml("lebateauivre"),- LipsumsCorpus.LeMasque => GetTextFromRawXml("lemasque"),- LipsumsCorpus.LoremIpsum => GetTextFromRawXml("loremipsum"),- LipsumsCorpus.NagyonFaj => GetTextFromRawXml("nagyonfaj"),- LipsumsCorpus.Omagyar => GetTextFromRawXml("omagyar"),- LipsumsCorpus.RobinsonoKruso => GetTextFromRawXml("robinsonokruso"),- LipsumsCorpus.TheRaven => GetTextFromRawXml("theraven"),- LipsumsCorpus.TierrayLuna => GetTextFromRawXml("tierrayluna"),- _ => throw new NotSupportedException(),- };- }-- private static string GetTextFromRawXml(string resourceName)- {- return LipsumUtilities.GetTextFromRawXml(ReadEmbeddedResource(resourceName)).ToString();- }-- private static string ReadEmbeddedResource(string name)- {- var assembly = Assembly.GetExecutingAssembly();- string resourceName = $"DevToys.Tools.Assets.Lipsums.{name}.xml";-- using Stream stream = assembly.GetManifestResourceStream(resourceName)!;- using StreamReader reader = new(stream, System.Text.Encoding.UTF8);- string text = reader.ReadToEnd();- return text;- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/LoremIpsum/LipsumsCorpus.cs b/src/app/dev/DevToys.Tools/Helpers/LoremIpsum/LipsumsCorpus.csdeleted file mode 100644index ac6ef9b75..000000000--- a/src/app/dev/DevToys.Tools/Helpers/LoremIpsum/LipsumsCorpus.cs+++ /dev/null@@ -1,17 +0,0 @@-namespace DevToys.Tools.Helpers.LoremIpsum;--internal enum LipsumsCorpus-{- ChildHarold,- Decameron,- Faust,- InDerFremde,- LeBateauIvre,- LeMasque,- LoremIpsum,- NagyonFaj,- Omagyar,- RobinsonoKruso,- TheRaven,- TierrayLuna-}diff --git a/src/app/dev/DevToys.Tools/Helpers/LoremIpsum/Paragraph.cs b/src/app/dev/DevToys.Tools/Helpers/LoremIpsum/Paragraph.csdeleted file mode 100644index cf2e10a17..000000000--- a/src/app/dev/DevToys.Tools/Helpers/LoremIpsum/Paragraph.cs+++ /dev/null@@ -1,68 +0,0 @@-// Forked from https://github.com/alexcpendleton/NLipsum--namespace DevToys.Tools.Helpers.LoremIpsum;--/// <summary>-/// A Paragraph that can be formatted..-/// </summary>-internal sealed class Paragraph : TextFeature-{- private Sentence _sentenceOptions = Sentence.Medium;-- /// <summary>- /// Instantiates a paragraph with no formatting.- /// </summary>- /// <param name="minSentences">The minimum amount of sentences to be included in this paragraph.</param>- /// <param name="maxSentences">The maximum amount of sentences to be included in this paragraph.</param>- internal Paragraph(uint minSentences, uint maxSentences)- : this(minSentences, maxSentences, FormatStrings.Unformatted) { }-- internal Paragraph(uint minSentences, uint maxSentences, string formatString)- {- MinimumSentences = minSentences;- MaximumSentences = maxSentences;- FormatString = formatString;- }-- /// <summary>- /// Gets or sets the minimum amount of sentences in this paragraph.- /// </summary>- internal uint MinimumSentences- {- get => MinimumValue;- set => MinimumValue = value;- }-- /// <summary>- /// Gets or sets the maximum amount of words in this paragraph.- /// </summary>- internal uint MaximumSentences- {- get => MaximumValue;- set => MaximumValue = value;- }-- /// <summary>- /// Gets a Short Paragraph. (MinimumSentences = 2, MaximumSentences=8)- /// </summary>- internal static Paragraph Short => new(2, 8);-- /// <summary>- /// Gets a Medium length Paragraph. (MinimumSentences = 3, MaximumSentences=20)- /// </summary>- internal static Paragraph Medium => new(3, 20);-- /// <summary>- /// Gets a Long Paragraph. (MinimumSentences = 6, MaximumSentences=40)- /// </summary>- internal static Paragraph Long => new(6, 40);-- /// <summary>- /// Gets or sets the options for the sentences in this paragraph. Default is Sentence.Medium- /// </summary>- internal Sentence SentenceOptions- {- get => _sentenceOptions;- set => _sentenceOptions = value;- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/LoremIpsum/Sentence.cs b/src/app/dev/DevToys.Tools/Helpers/LoremIpsum/Sentence.csdeleted file mode 100644index e27b2b7dc..000000000--- a/src/app/dev/DevToys.Tools/Helpers/LoremIpsum/Sentence.cs+++ /dev/null@@ -1,73 +0,0 @@-// Forked from https://github.com/alexcpendleton/NLipsum--namespace DevToys.Tools.Helpers.LoremIpsum;--/// <summary>-/// A sentence that can be formatted.-/// </summary>-internal sealed class Sentence : TextFeature-{- /// <summary>- /// Instantiates a sentence with Phrase formatting.- /// </summary>- /// <param name="minWords">The minimum amount of words to be included in this sentence.</param>- /// <param name="maxWords">The maximum amount of words to be included in this sentence.</param>- internal Sentence(uint minWords, uint maxWords)- : this(minWords, maxWords, FormatStrings.Sentence.Phrase) { }-- /// <summary>- /// Instantiates a sentence based on the passed criteria.- /// </summary>- /// <param name="minWords">The minimum amount of words to be included in this sentence.</param>- /// <param name="maxWords">The maximum amount of words to be included in this sentence.</param>- /// <param name="formatString">The string used to format this sentence.</param>- internal Sentence(uint minWords, uint maxWords, string formatString)- {- FormatString = formatString;- MinimumWords = minWords;- MaximumWords = maxWords;- }-- /// <summary>- /// Gets or sets the minimum amount of words in this sentence.- /// </summary>- internal uint MinimumWords- {- get => MinimumValue;- set => MinimumValue = value;- }-- /// <summary>- /// Gets or sets the maximum amount of words in this sentence.- /// </summary>- internal uint MaximumWords- {- get => MaximumValue;- set => MaximumValue = value;- }-- /// <summary>- /// Gets a Short Sentence. (MinimumWords = 2, MaximumWords=8)- /// </summary>- internal static Sentence Short => new(2, 8);-- /// <summary>- /// Gets a Medium length Sentence. (MinimumWords = 3, MaximumWords=20)- /// </summary>- internal static Sentence Medium => new(3, 20);-- /// <summary>- /// Gets a Long Sentence. (MinimumWords = 6, MaximumWords=40)- /// </summary>- internal static Sentence Long => new(6, 40);-- internal override string Format(string text)- {- string result = base.Format(text);- if (result.Length > 1)- {- result = string.Concat(result.Substring(0, 1).ToUpper(), result.AsSpan(1));- }- return result;- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/LoremIpsum/TextFeature.cs b/src/app/dev/DevToys.Tools/Helpers/LoremIpsum/TextFeature.csdeleted file mode 100644index 57aa45f32..000000000--- a/src/app/dev/DevToys.Tools/Helpers/LoremIpsum/TextFeature.cs+++ /dev/null@@ -1,76 +0,0 @@-// Forked from https://github.com/alexcpendleton/NLipsum--namespace DevToys.Tools.Helpers.LoremIpsum;--/// <summary>-/// Represents a part or section of text, such as a paragraph or sentence.-/// </summary>-internal abstract class TextFeature-{- private uint _minimumValue = 0;- private uint _maximumValue = 0;- private string _formatString = string.Empty;-- private string _delimiter = " ";-- /// <summary>- /// Gets or sets the minimum amount of sub features in this feature.- /// </summary>- protected uint MinimumValue- {- get => _minimumValue;- set => _minimumValue = value;- }-- /// <summary>- /// Gets or sets the maximum amount of sub features in this feature.- /// </summary>- protected uint MaximumValue- {- get => _maximumValue;- set => _maximumValue = value;- }-- /// <summary>- /// Gets or sets how this feature should be rendered. By default: "{0}." (ends with a period.)- /// For an html tag you could use "<div>{0}</div>".- /// You get the picture.- /// </summary>- internal string FormatString- {- get => _formatString;- set => _formatString = value;- }-- /// <summary>- /// Gets or sets the delimiter between the subparts.- /// </summary>- internal string Delimiter- {- get => _delimiter;- set => _delimiter = value;- }-- /// <summary>- /// Formats this feature based on its FormatString.- /// </summary>- /// <param name="text">The text with which to format the string.</param>- /// <returns></returns>- internal virtual string Format(string text)- {- return string.Format(FormatString, text);- }-- /* This kind of smells */- /// <summary>- /// Gets the minimum sub feature value.- /// </summary>- /// <returns></returns>- internal uint GetMinimum() { return MinimumValue; }-- /// <summary>- /// Gets the maximum sub feature value.- /// </summary>- /// <returns></returns>- internal uint GetMaximum() { return MaximumValue; }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/LoremIpsum/Word.cs b/src/app/dev/DevToys.Tools/Helpers/LoremIpsum/Word.csdeleted file mode 100644index cbe9e2872..000000000--- a/src/app/dev/DevToys.Tools/Helpers/LoremIpsum/Word.cs+++ /dev/null@@ -1,63 +0,0 @@-namespace DevToys.Tools.Helpers.LoremIpsum;--internal sealed class Word : TextFeature-{- /// <summary>- /// Instantiates a medium sized sentence with Phrase formatting.- /// </summary>- internal Word() : this(Medium.MinimumValue, Medium.MaximumValue) { }-- /// <summary>- /// Instantiates a sentence with Phrase formatting.- /// </summary>- /// <param name="minWords">The minimum amount of words to be included in this sentence.</param>- /// <param name="maxWords">The maximum amount of words to be included in this sentence.</param>- internal Word(uint minWords, uint maxWords)- : this(minWords, maxWords, FormatStrings.Unformatted) { }-- /// <summary>- /// Instantiates a sentence based on the passed criteria.- /// </summary>- /// <param name="minWords">The minimum amount of words to be included in this sentence.</param>- /// <param name="maxWords">The maximum amount of words to be included in this sentence.</param>- /// <param name="formatString">The string used to format this sentence.</param>- internal Word(uint minWords, uint maxWords, string formatString)- {- FormatString = formatString;- MinimumValue = minWords;- MaximumValue = maxWords;- }-- /// <summary>- /// Gets or sets the minimum amount of characters in this word.- /// </summary>- internal uint MinimumCharacters- {- get => MinimumValue;- set => MinimumValue = value;- }-- /// <summary>- /// Gets or sets the maximum amount of characters in this word.- /// </summary>- internal uint MaximumCharacters- {- get => MaximumValue;- set => MaximumValue = value;- }-- /// <summary>- /// Gets a Short Sentence. (MinimumWords = 2, MaximumWords=8)- /// </summary>- internal static Word Short => new(1, 3);-- /// <summary>- /// Gets a Medium length Sentence. (MinimumWords = 3, MaximumWords=20)- /// </summary>- internal static Word Medium => new(4, 8);-- /// <summary>- /// Gets a Long Sentence. (MinimumWords = 6, MaximumWords=40)- /// </summary>- internal static Word Long => new(10, 25);-}diff --git a/src/app/dev/DevToys.Tools/Helpers/MemoryExtensions.cs b/src/app/dev/DevToys.Tools/Helpers/MemoryExtensions.csdeleted file mode 100644index c80e17589..000000000--- a/src/app/dev/DevToys.Tools/Helpers/MemoryExtensions.cs+++ /dev/null@@ -1,135 +0,0 @@-using System.Text;-using DevToys.Tools.Models;--namespace DevToys.Tools.Helpers;--internal static class MemoryExtensions-{- /// <summary>- /// Detects whether the given location in a span of characters is a line break.- /// </summary>- internal static bool IsLineBreak(this Span<char> span, int i, out EndOfLineSequence lineBreakType)- {- return ((ReadOnlySpan<char>)span).IsLineBreak(i, out lineBreakType);- }-- /// <summary>- /// Detects whether the given location in a span of characters is a line break.- /// </summary>- internal static bool IsLineBreak(this ReadOnlySpan<char> span, int i, out EndOfLineSequence lineBreakType)- {- if (i < span.Length)- {- char c1 = span[i];- if (c1 == '\n')- {- lineBreakType = EndOfLineSequence.LineFeed;- return true;- }-- if (c1 == '\r')- {- if (i < span.Length - 1 && span[i + 1] == '\n')- {- lineBreakType = EndOfLineSequence.CarriageReturnLineFeed;- }- else- {- lineBreakType = EndOfLineSequence.CarriageReturn;- }-- return true;- }- }-- lineBreakType = EndOfLineSequence.Unknown;- return false;- }-- /// <summary>- /// Gets the last word in a span of characters. This takes into account the fact that the last word may be before a word delimiter.- /// For example, in the sentence "Hello world.", the last word is "world", but the last character is a dot.- /// </summary>- /// <param name="span"></param>- /// <returns></returns>- internal static ReadOnlySpan<char> GetLastWord(this ReadOnlySpan<char> span)- {- if (span.IsEmpty)- {- return span;- }-- // Find the last word. We start reading the span from the end, and stop when we find a word delimiter such as a dot or whitespace.- // If the last character of the span is a word delimiter, we slice the span from the index before the last delimiter.- int spanEndOfLastWord = -1;- int spanBeginningOfLastWord = -1;- for (int i = span.Length - 1; i >= 0; i--)- {- if (spanEndOfLastWord == -1)- {- if (char.IsLetterOrDigit(span[i]))- {- spanEndOfLastWord = i + 1;- }- }- else if (!char.IsLetterOrDigit(span[i]))- {- spanBeginningOfLastWord = i + 1;- break;- }- else- {- spanBeginningOfLastWord = i;- }- }-- if (spanBeginningOfLastWord == -1 || spanEndOfLastWord == -1)- {- spanBeginningOfLastWord = 0;- spanEndOfLastWord = 0;- }-- return span.Slice(spanBeginningOfLastWord, spanEndOfLastWord - spanBeginningOfLastWord);- }-- /// <summary>- /// Splits the given span of characters into lines.- /// </summary>- internal static List<ReadOnlyMemory<char>> ToLines(this ReadOnlyMemory<char> span)- {- // Split text by lines.- var lines = new List<ReadOnlyMemory<char>>();-- SpanLineEnumerator lineEnumerator = span.Span.EnumerateLines(); // This supports every kind of line break.-- while (lineEnumerator.MoveNext())- {- ReadOnlySpan<char> line = lineEnumerator.Current;- char[] lineBuffer = new char[line.Length];- line.CopyTo(lineBuffer);- lines.Add(lineBuffer);- }-- return lines;- }-- /// <summary>- /// Rebuilds a string from a list of lines.- /// </summary>- internal static string BuildStringFromListOfLines(this IReadOnlyList<ReadOnlyMemory<char>> lines, EndOfLineSequence endOfLineSequence)- {- var stringBuilder = new StringBuilder();- string endOfLineSequenceString = endOfLineSequence.ToLineBreakCharacters();-- for (int i = 0; i < lines.Count; i++)- {- stringBuilder.Append(lines[i].Span);- if (i < lines.Count - 1)- {- stringBuilder.Append(endOfLineSequenceString);- }- }-- return stringBuilder.ToString();- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/NumberBaseHelper.cs b/src/app/dev/DevToys.Tools/Helpers/NumberBaseHelper.csdeleted file mode 100644index dc8d4ebb1..000000000--- a/src/app/dev/DevToys.Tools/Helpers/NumberBaseHelper.cs+++ /dev/null@@ -1,174 +0,0 @@-using System.Globalization;-using System.Text;-using DevToys.Tools.Models.NumberBase;-using DevToys.Tools.Tools.Converters.NumberBase;-using Decimal = DevToys.Tools.Models.NumberBase.Decimal;--namespace DevToys.Tools.Helpers;--internal static class NumberBaseHelper-{- internal static bool TryDetectNumberBase(string? potentialNumber, out INumberBaseDefinition<long>? numberBaseDefinition)- {- numberBaseDefinition = null;-- if (string.IsNullOrWhiteSpace(potentialNumber)- || potentialNumber.Length > 100) // unlikely to be a number.- {- return false;- }-- // Remove the potential formatting on the input number.- string unformattedPotentialNumber = UnformatNumber(potentialNumber);-- // Try to detect the base of the input number.- try- {- long parsedNumber = Decimal.Instance.Parse(unformattedPotentialNumber);- numberBaseDefinition = Decimal.Instance;- return true;- }- catch { }-- try- {- long parsedNumber = Binary.Instance.Parse(unformattedPotentialNumber);- numberBaseDefinition = Binary.Instance;- return true;- }- catch { }-- try- {- long parsedNumber = Hexadecimal.Instance.Parse(unformattedPotentialNumber);- numberBaseDefinition = Hexadecimal.Instance;- return true;- }- catch { }-- try- {- long parsedNumber = Octal.Instance.Parse(unformattedPotentialNumber);- numberBaseDefinition = Octal.Instance;- return true;- }- catch { }-- return false;- }-- internal static bool TryConvertNumberBase(- string? inputNumber,- INumberBaseDefinition<long> numberBase,- bool format,- out string hexadecimal,- out string @decimal,- out string octal,- out string binary,- out string error)- {- Guard.IsNotNull(numberBase);-- hexadecimal = string.Empty;- @decimal = string.Empty;- octal = string.Empty;- binary = string.Empty;- error = string.Empty;-- if (string.IsNullOrWhiteSpace(inputNumber))- {- return true;- }-- if (!TryParseNumber(inputNumber, numberBase, out long signedValue, out error))- {- return false;- }-- // Convert the number to the other bases and format them if needed.- hexadecimal = Hexadecimal.Instance.ToFormattedString(signedValue, format);- @decimal = Decimal.Instance.ToFormattedString(signedValue, format);- octal = Octal.Instance.ToFormattedString(signedValue, format);- binary = Binary.Instance.ToFormattedString(signedValue, format);- return true;- }-- internal static bool TryConvertNumberBase<T>(- string? inputNumber,- INumberBaseDefinition<T> inputNumberBase,- INumberBaseDefinition<T> outputNumberBase,- bool format,- out string result,- out string error)- where T : struct- {- Guard.IsNotNull(inputNumberBase);- Guard.IsNotNull(outputNumberBase);-- result = string.Empty;- error = string.Empty;-- if (string.IsNullOrWhiteSpace(inputNumber))- {- return true;- }-- if (!TryParseNumber(inputNumber, inputNumberBase, out T unsignedValue, out error))- {- return false;- }-- // Convert the number to the other bases and format them if needed.- result = outputNumberBase.ToFormattedString(unsignedValue, format);- return true;- }-- private static bool TryParseNumber<T, U>(string? inputNumber, T numberBase, out U value, out string error)- where T : INumberBaseDefinition<U>- where U : struct- {- value = default;- error = string.Empty;-- // Remove the potential formatting on the input number.- string unformattedInputNumber = UnformatNumber(inputNumber);-- try- {- // Try to parse the number.- value = numberBase.Parse(unformattedInputNumber);- return true;- }- catch (OverflowException)- {- error = string.Format(NumberBaseConverter.ValueOverflow, numberBase.DisplayName, numberBase.MaxValue);- return false;- }- catch (Exception)- {- error = string.Format(NumberBaseConverter.ValueInvalid, numberBase.DisplayName);- return false;- }- }-- private static string UnformatNumber(string? formattedNumber)- {- if (string.IsNullOrWhiteSpace(formattedNumber!))- {- return string.Empty;- }-- var unformattedNumber = new StringBuilder();-- string currentCulture = CultureInfo.CurrentCulture.NumberFormat.NumberGroupSeparator;- for (int i = 0; i < formattedNumber.Length; i++)- {- if (!char.IsWhiteSpace(formattedNumber[i]) && formattedNumber[i] != Convert.ToChar(currentCulture))- {- unformattedNumber.Append(formattedNumber[i]);- }- }-- return unformattedNumber.ToString();- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/PasswordGeneratorHelper.cs b/src/app/dev/DevToys.Tools/Helpers/PasswordGeneratorHelper.csdeleted file mode 100644index b818946a2..000000000--- a/src/app/dev/DevToys.Tools/Helpers/PasswordGeneratorHelper.cs+++ /dev/null@@ -1,107 +0,0 @@-using System.Text;-using DevToys.Tools.Helpers.Core;--namespace DevToys.Tools.Helpers;--internal static class PasswordGeneratorHelper-{- /// <summary>- /// All non-alphanumeric characters.- /// </summary>- internal const string NonAlphanumeric = "!@#$%^&*";-- /// <summary>- /// All lower case ASCII characters.- /// </summary>- internal const string LowercaseLetters = "abcdefghijkmnopqrstuvwxyz";-- /// <summary>- /// All upper case ASCII characters.- /// </summary>- internal const string UppercaseLetters = "ABCDEFGHJKLMNOPQRSTUVWXYZ";-- /// <summary>- /// All digits.- /// </summary>- internal const string Digits = "0123456789";-- internal static string GeneratePassword(- int length,- bool hasUppercase,- bool hasLowercase,- bool hasNumbers,- bool hasSpecialCharacters,- char[]? excludedCharacters)- {- if (length <= 0)- {- return string.Empty;- }-- // Combine all character sets together.- string[] randomChars = new[] {- string.Empty,- string.Empty,- string.Empty,- string.Empty- };-- var rand = new CryptoRandom();- var newPasswordCharacters = new List<char>();-- if (hasUppercase)- {- randomChars[0] = RemoveExcludedCharacters(UppercaseLetters, excludedCharacters);- }-- if (hasLowercase)- {- randomChars[1] = RemoveExcludedCharacters(LowercaseLetters, excludedCharacters);- }-- if (hasNumbers)- {- randomChars[2] = RemoveExcludedCharacters(Digits, excludedCharacters);- }-- if (hasSpecialCharacters)- {- randomChars[3] = RemoveExcludedCharacters(NonAlphanumeric, excludedCharacters);- }-- randomChars = randomChars.Where(r => r.Length > 0).ToArray();-- // Only continue if the user hasn't excluded everything.- if (randomChars.Length != 0)- {- for (int j = 0; j < length; j++)- {- string rcs = randomChars[rand.Next(0, randomChars.Length)];- newPasswordCharacters.Insert(rand.Next(0, newPasswordCharacters.Count), rcs[rand.Next(0, rcs.Length)]);- }- }-- return new string(newPasswordCharacters.ToArray());- }-- private static string RemoveExcludedCharacters(string input, char[]? excludedCharacters)- {- if (excludedCharacters == null || excludedCharacters.Length == 0)- {- return input;- }-- var excludedSet = new HashSet<char>(excludedCharacters); // HashSet provides a faster lookup than Array.Contains().- var stringBuilder = new StringBuilder();-- foreach (char c in input)- {- if (!excludedSet.Contains(c))- {- stringBuilder.Append(c);- }- }-- return stringBuilder.ToString();- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/QrCodeHelper.cs b/src/app/dev/DevToys.Tools/Helpers/QrCodeHelper.csdeleted file mode 100644index 43009c211..000000000--- a/src/app/dev/DevToys.Tools/Helpers/QrCodeHelper.cs+++ /dev/null@@ -1,76 +0,0 @@-using System.IO;-using SixLabors.ImageSharp;-using SixLabors.ImageSharp.PixelFormats;-using ZXing;-using ZXing.Common;-using static ZXing.Rendering.SvgRenderer;-using ZXing.QrCode.Internal;-using ZXing.Rendering;--namespace DevToys.Tools.Helpers;--internal static class QrCodeHelper-{- internal static Image<Rgba32> GenerateQrCode(string text)- {- var barcodeWriter = new ZXing.ImageSharp.BarcodeWriter<Rgba32>- {- Format = BarcodeFormat.QR_CODE,- Options = new EncodingOptions- {- Height = 1024,- Width = 1024,- Margin = 2- }- };-- Image<Rgba32> image = barcodeWriter.Write(text);- return image;- }-- internal static string GenerateSvgQrCode(string text)- {- BarcodeWriterSvg barcodeWriter = new()- {- Format = BarcodeFormat.QR_CODE,- Renderer = new SvgRenderer()- };-- EncodingOptions encodingOptions = new()- {- Width = 1024,- Height = 1024,- Margin = 2,- };- encodingOptions.Hints.Add(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.M);- barcodeWriter.Options = encodingOptions;-- SvgImage svg = barcodeWriter.Write(text);- return svg.Content;- }-- internal static async Task<string> ReadQrCodeAsync(Stream stream, CancellationToken cancellationToken)- {- using Image<Rgba32> bitmap = await Image.LoadAsync<Rgba32>(stream, cancellationToken);-- var barcodeReader = new ZXing.ImageSharp.BarcodeReader<Rgba32>()- {- AutoRotate = true,- Options =- {- TryHarder = true,- TryInverted = true,- PossibleFormats = new List<BarcodeFormat> { BarcodeFormat.QR_CODE }- }- };-- Result decodedQrCode = barcodeReader.Decode(bitmap);-- if (decodedQrCode is not null && !string.IsNullOrWhiteSpace(decodedQrCode.Text))- {- return decodedQrCode.Text;- }-- return string.Empty;- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Core/Formatter.cs b/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Core/Formatter.csdeleted file mode 100644index 15bd5718f..000000000--- a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Core/Formatter.cs+++ /dev/null@@ -1,366 +0,0 @@-using System.Text;-using System.Text.RegularExpressions;--namespace DevToys.Tools.Helpers.SqlFormatter.Core;--internal abstract class Formatter-{- private static readonly Regex CommentWhitespacesRegex = new(@"\n[ \t]*", RegexOptions.Compiled, RegexFactory.DefaultMatchTimeout);-- private readonly InlineBlock _inlineBlock = new();- private readonly StringBuilder _queryBuilder = new();-- private Indentation? _indentation = null;- private SqlFormatterOptions _options;- private Params? _params = null;- private IReadOnlyList<Token>? _tokens = null;- protected Token? _previousReservedToken = null;- private int _index;-- /// <summary>- /// Formats whitespace in a SQL string to make it easier to read.- /// </summary>- internal string Format(string query)- {- return Format(query, new SqlFormatterOptions(Indentation: Models.Indentation.TwoSpaces, Uppercase: false));- }-- /// <summary>- /// Formats whitespace in a SQL string to make it easier to read.- /// </summary>- internal string Format(string query, SqlFormatterOptions options)- {- _options = options;- _indentation = new Indentation(options.Indentation);- _params = new Params(options.PlaceholderParameters);-- _tokens = GetTokenizer().Tokenize(query);- SetFormattedQueryFromTokens(query.AsSpan());- return _queryBuilder.ToString().Trim();- }-- /// <summary>- /// SQL Tokenizer for this formatter, provided by subclasses.- /// </summary>- protected abstract Tokenizer GetTokenizer();-- /// <summary>- /// Reprocess and modify a token based on parsed context.- /// </summary>- protected virtual Token TokenOverride(Token token, ReadOnlySpan<char> querySpan)- {- // subclasses can override this to modify tokens during formatting- return token;- }-- protected Token? TokenLookBehind(int n = 1)- {- return _tokens?.ElementAtOrDefault(_index - n);- }-- protected Token? TokenLookAhead(int n = 1)- {- if (_tokens is null || _tokens!.Count <= _index + n)- return null;- return _tokens![_index + n];- }-- private void SetFormattedQueryFromTokens(ReadOnlySpan<char> querySpan)- {- _queryBuilder.Clear();-- Guard.IsNotNull(_tokens);- for (int i = 0; i < _tokens!.Count; i++)- {- _index = i;-- Token token = TokenOverride(_tokens[i], querySpan);- switch (token.Type)- {- case TokenType.LineComment:- FormatLineComment(token, querySpan);- break;- case TokenType.BlockComment:- FormatBlockComment(token, querySpan);- break;- case TokenType.ReservedTopLevel:- FormatTopLevelReservedWord(token, querySpan);- _previousReservedToken = token;- break;- case TokenType.ReservedTopLevelNoIndent:- FormatTopLevelReservedWordNoIndent(token, querySpan);- _previousReservedToken = token;- break;- case TokenType.ReservedNewLine:- FormatNewlineReservedWord(token, querySpan);- _previousReservedToken = token;- break;- case TokenType.Reserved:- FormatWithSpaces(token, querySpan);- _previousReservedToken = token;- break;- case TokenType.OpenParen:- FormatOpeningParentheses(token, querySpan);- break;- case TokenType.CloseParen:- FormatClosingParentheses(token, querySpan);- break;- case TokenType.PlaceHolder:- FormatPlaceholder(token, querySpan);- break;- default:- switch (token.Length)- {- case 1 when querySpan[token.Index] == ',':- FormatComma(token, querySpan);- break;- case 1 when querySpan[token.Index] == ':':- FormatWithSpaceAfter(token, querySpan);- break;- case 1 when querySpan[token.Index] == '.':- FormatWithoutSpaces(token, querySpan);- break;- case 1 when querySpan[token.Index] == ';':- FormatQuerySeparator(token, querySpan);- break;- default:- FormatWithSpaces(token, querySpan);- break;- }- break;- }- }- }-- private void FormatLineComment(Token token, ReadOnlySpan<char> querySpan)- {- AppendToken(querySpan, token);- AddNewLine();- }-- private void FormatBlockComment(Token token, ReadOnlySpan<char> querySpan)- {- AddNewLine();- _queryBuilder.Append(IndentComment(querySpan.Slice(token)));- AddNewLine();- }-- private string IndentComment(ReadOnlySpan<char> comment)- {- Guard.IsNotNull(_indentation);- return CommentWhitespacesRegex.Replace(comment.ToString(), $"\n{_indentation!.GetIndent()} ");- }-- private void FormatTopLevelReservedWordNoIndent(Token token, ReadOnlySpan<char> querySpan)- {- Guard.IsNotNull(_indentation);- _indentation!.DecreaseTopLevel();-- AddNewLine();-- AppendToken(querySpan, token);-- AddNewLine();- }-- private void FormatTopLevelReservedWord(Token token, ReadOnlySpan<char> querySpan)- {- Guard.IsNotNull(_indentation);- _indentation!.DecreaseTopLevel();-- AddNewLine();-- _indentation.IncreaseTopLevel();-- AppendToken(querySpan, token);-- AddNewLine();- }-- private void FormatNewlineReservedWord(Token token, ReadOnlySpan<char> querySpan)- {- if (token.IsAnd(querySpan.Slice(token)))- {- Token? t = TokenLookBehind(2);-- if (t != null && t.Value.IsBetween(querySpan.Slice(t.Value)))- {- FormatWithSpaces(token, querySpan);- return;- }- }- AddNewLine();-- AppendToken(querySpan, token);-- _queryBuilder.Append(' ');- }-- /// <summary>- /// Opening parentheses increase the block indent level and start a new line- /// </summary>- private void FormatOpeningParentheses(Token token, ReadOnlySpan<char> querySpan)- {- // Take out the preceding space unless there was whitespace there in the original query- // or another opening parens or line comment- if (token.PrecedingWitespaceLength == 0)- {- Token? behindToken = TokenLookBehind();-- if (behindToken is not { Type: TokenType.OpenParen or TokenType.LineComment or TokenType.Operator }- && !behindToken?.IsValues(querySpan.Slice(behindToken!.Value)) == true)- {- _queryBuilder.TrimSpaceEnd();- }- }- AppendToken(querySpan, token);-- Guard.IsNotNull(token);- _inlineBlock.BeginIfPossible(_tokens!, _index, querySpan.Slice(token));-- if (!_inlineBlock.IsActive())- {- Guard.IsNotNull(_indentation);- _indentation!.IncreaseBlockLevel();- AddNewLine();- }- }-- /// <summary>- /// Closing parentheses decrease the block indent level- /// </summary>- private void FormatClosingParentheses(Token token, ReadOnlySpan<char> querySpan)- {- Guard.IsNotNull(_indentation);- if (_inlineBlock.IsActive())- {- _inlineBlock.End();- FormatWithSpaceAfter(token, querySpan);- }- else- {- _indentation!.DecreaseBlockLevel();- AddNewLine();- FormatWithSpaces(token, querySpan);- }- }-- private void FormatPlaceholder(Token token, ReadOnlySpan<char> querySpan)- {- Guard.IsNotNull(_params);-- string? value = null;- ReadOnlySpan<char> valueSpan = querySpan.Slice(token);- if (valueSpan.Length != 0)- // assume the length of all placeholder is 1, since only char array is accepted- value = _params!.Get(valueSpan.Slice(0, 1).ToString());-- _queryBuilder.Append(value ?? querySpan.Slice(token).ToString());-- _queryBuilder.Append(' ');- }-- /// <summary>- /// Commas start a new line (unless within inline parentheses or SQL "LIMIT" clause)- /// </summary>- private void FormatComma(Token token, ReadOnlySpan<char> querySpan)- {- _queryBuilder.TrimSpaceEnd();-- if (_options.UseLeadingComma)- {- AddNewLine();- }-- AppendToken(querySpan, token);-- _queryBuilder.Append(' ');-- if (_inlineBlock.IsActive())- {- return;- }- else if (_previousReservedToken is not null- && _previousReservedToken.Value.IsLimit(querySpan.Slice(_previousReservedToken.Value)))- {- return;- }-- if (!_options.UseLeadingComma)- {- AddNewLine();- }- }-- private void FormatWithSpaceAfter(Token token, ReadOnlySpan<char> querySpan)- {- _queryBuilder.TrimSpaceEnd();- AppendToken(querySpan, token);- _queryBuilder.Append(' ');- }-- private void FormatWithoutSpaces(Token token, ReadOnlySpan<char> querySpan)- {- _queryBuilder.TrimSpaceEnd();- AppendToken(querySpan, token);- }-- private void FormatWithSpaces(Token token, ReadOnlySpan<char> querySpan)- {- AppendToken(querySpan, token);- _queryBuilder.Append(' ');- }-- private void FormatQuerySeparator(Token token, ReadOnlySpan<char> querySpan)- {- Guard.IsNotNull(_indentation);- _indentation!.ResetIndentation();-- _queryBuilder.TrimSpaceEnd();- AppendToken(querySpan, token);-- int times = _options.LinesBetweenQueries;-- while (times != 0)- {- _queryBuilder.AppendLine();- times--;- }- }-- /// <summary>- /// Appends the token value to the _queryBuilder, optionally uppercasing it.- /// </summary>- private void AppendToken(ReadOnlySpan<char> value, Token token)- {- if (_options.Uppercase- && (token.Type is TokenType.Reserved- or TokenType.ReservedTopLevel- or TokenType.ReservedTopLevelNoIndent- or TokenType.ReservedNewLine- or TokenType.OpenParen- or TokenType.CloseParen))- {- foreach (char c in value.Slice(token))- {- _queryBuilder.Append(char.ToUpper(c));- }- }- else- {- _queryBuilder.Append(value.Slice(token));- }- }-- private void AddNewLine()- {- Guard.IsNotNull(_indentation);-- _queryBuilder.TrimSpaceEnd();-- if (_queryBuilder.Length != 0 && _queryBuilder[^1] != '\n')- _queryBuilder.AppendLine();-- _queryBuilder.Append(_indentation!.GetIndent());- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Core/Indentation.cs b/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Core/Indentation.csdeleted file mode 100644index f2954089a..000000000--- a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Core/Indentation.cs+++ /dev/null@@ -1,87 +0,0 @@-namespace DevToys.Tools.Helpers.SqlFormatter.Core;--/// <summary>-/// Manages indentation levels.-/// </summary>-internal sealed class Indentation-{- private enum IndentationType- {- /// <summary>- /// increased by ReservedTopLevel words- /// </summary>- TopLevel,-- /// <summary>- /// increased by open-parenthesis- /// </summary>- BlockLevel- }-- private readonly Stack<IndentationType> _indentationTypes = new();- private readonly Models.Indentation _indentation;-- public Indentation(Models.Indentation indentation)- {- _indentation = indentation;- }-- /// <summary>- /// Returns current indentation string.- /// </summary>- internal string GetIndent()- {- return _indentation switch- {- Models.Indentation.TwoSpaces => new string(' ', 2 * _indentationTypes.Count),- Models.Indentation.FourSpaces => new string(' ', 4 * _indentationTypes.Count),- Models.Indentation.OneTab => new string('\t', 1 * _indentationTypes.Count),- _ => throw new NotSupportedException(),- };- }-- /// <summary>- /// Increases indentation by one top-level indent.- /// </summary>- internal void IncreaseTopLevel()- {- _indentationTypes.Push(IndentationType.TopLevel);- }-- /// <summary>- /// Increases indentation by one block-level indent.- /// </summary>- internal void IncreaseBlockLevel()- {- _indentationTypes.Push(IndentationType.BlockLevel);- }-- /// <summary>- /// Decreases indentation by one top-level indent.- /// Does nothing when the previous indent is not top-level.- /// </summary>- internal void DecreaseTopLevel()- {- if (_indentationTypes.TryPeek(out IndentationType type) && type == IndentationType.TopLevel)- _indentationTypes.Pop();- }-- /// <summary>- /// Decreases indentation by one block-level indent.- /// If there are top-level indents within the block-level indent, throws away these as well.- /// </summary>- internal void DecreaseBlockLevel()- {- while (_indentationTypes.Count > 0)- {- IndentationType type = _indentationTypes.Pop();- if (type != IndentationType.TopLevel)- break;- }- }-- internal void ResetIndentation()- {- _indentationTypes.Clear();- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Core/InlineBlock.cs b/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Core/InlineBlock.csdeleted file mode 100644index 372fc0b26..000000000--- a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Core/InlineBlock.cs+++ /dev/null@@ -1,102 +0,0 @@-namespace DevToys.Tools.Helpers.SqlFormatter.Core;--/// <summary>-/// Bookkeeper for inline blocks.-/// Inline blocks are parenthized expressions that are shorter than INLINE_MAX_LENGTH.-/// These blocks are formatted on a single line, unlike longer parenthized expressions-/// where open-parenthesis causes newline and increase of indentation.-/// </summary>-internal sealed class InlineBlock-{- private const int InlineMaxLength = 50;-- private int _level = 0;-- /// <summary>- /// Begins inline block when lookahead through upcoming tokens determines that the- /// block would be smaller than INLINE_MAX_LENGTH.- /// </summary>- /// <param name="tokens">Array of all tokens</param>- /// <param name="index">Current token position</param>- internal void BeginIfPossible(IReadOnlyList<Token> tokens, int index, ReadOnlySpan<char> valueSpan)- {- if (_level == 0 && IsInlineBlock(tokens, index, valueSpan))- {- _level = 1;- }- else if (_level > 0)- {- _level++;- }- else- {- _level = 0;- }- }-- /// <summary>- /// Finishes current inline block. There might be several nested ones.- /// </summary>- internal void End()- {- _level--;- }-- /// <summary>- /// True when inside an inline block- /// </summary>- internal bool IsActive()- {- return _level > 0;- }-- /// <summary>- /// Check if this should be an inline parentheses block.- /// Examples are "NOW()", "COUNT(*)", "int(10)", key(`somecolumn`), DECIMAL(7,2)- /// </summary>- private static bool IsInlineBlock(IReadOnlyList<Token> tokens, int index, ReadOnlySpan<char> valueSpan)- {- int length = 0;- int level = 0;-- for (int i = index; i < tokens.Count; i++)- {- Token token = tokens[i];- length += token.Length;-- // Overran max length- if (length > InlineMaxLength)- {- return false;- }-- if (token.Type == TokenType.OpenParen)- {- level++;- }- else if (token.Type == TokenType.CloseParen)- {- level--;- if (level == 0)- return true;- }-- if (IsForbiddenToken(token, valueSpan))- return false;- }- return false;- }-- /// <summary>- /// Reserved words that cause newlines, comments and semicolons are not allowed inside inline parentheses block- /// </summary>- private static bool IsForbiddenToken(Token token, ReadOnlySpan<char> valueSpan)- {- return- token.Type == TokenType.ReservedTopLevel- || token.Type == TokenType.ReservedNewLine- // || token.Type == TokenType.LineComment- || token.Type == TokenType.BlockComment- || token.Length == 1 && valueSpan[0] == ';';- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Core/Params.cs b/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Core/Params.csdeleted file mode 100644index 91c1049df..000000000--- a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Core/Params.cs+++ /dev/null@@ -1,29 +0,0 @@-namespace DevToys.Tools.Helpers.SqlFormatter.Core;--/// <summary>-/// Handles placeholder replacement with given params.-/// </summary>-internal sealed class Params-{- private readonly IReadOnlyDictionary<string, string>? _params;- private int _index;-- public Params(IReadOnlyDictionary<string, string>? parameters)- {- _params = parameters;- }-- internal string? Get(string key)- {- if (_params is null)- return null;-- if (key is not null && key.Length != 0)- {- _params.TryGetValue(key, out string? paramValue);- return paramValue;- }-- return _params.ElementAtOrDefault(_index++).Value ?? null;- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Core/RegexFactory.cs b/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Core/RegexFactory.csdeleted file mode 100644index 4650ef9ec..000000000--- a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Core/RegexFactory.cs+++ /dev/null@@ -1,108 +0,0 @@-using System.Text.RegularExpressions;--namespace DevToys.Tools.Helpers.SqlFormatter.Core;--internal static class RegexFactory-{- internal static readonly TimeSpan DefaultMatchTimeout = TimeSpan.FromSeconds(1);- private static readonly Regex SpecialCharacterRegex = new(@"[.*+?^${}()|[\]\\]", RegexOptions.Compiled, DefaultMatchTimeout);- private static readonly Dictionary<string, string> Patterns = new()- {- { "``", "((`[^`]*($|`))+)" },- { "{}", "((\\{[^\\}]*($|\\}))+)" },- { "[]", "((\\[[^\\]]*($|\\]))(\\][^\\]]*($|\\]))*)" },- { "\"\"", "((\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*(\"|$))+)" },- { "''", "(('[^'\\\\]*(?:\\\\.[^'\\\\]*)*('|$))+)" },- { "N''", "((N'[^'\\\\]*(?:\\\\.[^'\\\\]*)*('|$))+)" },- { "U&''", "((U&'[^'\\\\]*(?:\\\\.[^'\\\\]*)*('|$))+)" },- { "U&\"\"", "((U&\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*(\"|$))+)" },- { "$$", "((?<tag>\\$\\w*\\$)[\\s\\S]*?(?:\\k<tag>|$))" }- };-- internal static Regex CreateOperatorRegex(IEnumerable<string> multiLetterOperators)- {- IOrderedEnumerable<string> sortedOperators = SortByLengthDesc(multiLetterOperators);- IEnumerable<string> escapedOperators = sortedOperators.Select(item => EscapeSpecialCharacters(item));- string operators = string.Join("|", escapedOperators);- return new Regex(@$"^({operators}|.)", RegexOptions.None, DefaultMatchTimeout);- }-- internal static Regex CreateLineCommentRegex(string[] lineCommentTypes)- {- return new Regex($"^((?:{string.Join('|', lineCommentTypes.Select(item => EscapeSpecialCharacters(item)))}).*?)(?:\\r\\n|\\r|\\n|$)", RegexOptions.Singleline, DefaultMatchTimeout);- }-- internal static Regex CreateReservedWordRegex(string[] reservedWords)- {- if (reservedWords.Length == 0)- return new Regex(@"^\b$", RegexOptions.None, DefaultMatchTimeout);-- string reservedWordsPattern = string.Join('|', SortByLengthDesc(reservedWords)).Replace(" ", "\\s+");- return new Regex(@$"^({reservedWordsPattern})\b", RegexOptions.IgnoreCase, DefaultMatchTimeout);- }-- internal static Regex CreateWordRegex(string[] specialCharacters)- {- return new Regex(@"^([\p{L}\p{M}\p{Nd}\p{Pc}\p{Cf}\p{Cs}\p{Co}" + $"{string.Join(string.Empty, specialCharacters)}]+)", RegexOptions.None, DefaultMatchTimeout);- }-- internal static Regex CreateStringRegex(string[] stringTypes)- {- return new Regex($"^({CreateStringPattern(stringTypes)})", RegexOptions.None, DefaultMatchTimeout);- }-- /// <summary>- /// This enables the following string patterns:- /// 1. backtick quoted string using `` to escape- /// 2. square bracket quoted string (SQL Server) using ]] to escape- /// 3. double quoted string using "" or \" to escape- /// 4. single quoted string using '' or \' to escape- /// 5. national character quoted string using N'' or N\' to escape- /// 6. Unicode single-quoted string using \' to escape- /// 7. Unicode double-quoted string using \" to escape- /// 8. PostgreSQL dollar-quoted strings- /// </summary>- internal static string CreateStringPattern(string[] stringTypes)- {- return string.Join('|', stringTypes.Select(item => Patterns[item]));- }-- internal static Regex? CreatePlaceholderRegex(char[] types, string pattern)- {- if (types is null || types.Length == 0)- return null;-- string typesRegex = string.Join('|', types.Select(item => EscapeSpecialCharacters(item.ToString())));-- return new Regex($"^((?:{typesRegex})(?:{pattern}))", RegexOptions.None, DefaultMatchTimeout);- }-- internal static Regex CreateParenRegex(string[] parens)- {- return new Regex($"^({string.Join('|', parens.Select(item => EscapeParen(item)))})", RegexOptions.IgnoreCase, DefaultMatchTimeout);- }-- private static string EscapeParen(string paren)- {- if (paren.Length == 1)- {- // A single punctuation character- return EscapeSpecialCharacters(paren);- }- else- {- // longer word- return $"\\b{paren}\\b";- }- }-- private static IOrderedEnumerable<string> SortByLengthDesc(IEnumerable<string> strings)- {- return strings.OrderByDescending(s => s.Length);- }-- private static string EscapeSpecialCharacters(string input)- {- return SpecialCharacterRegex.Replace(input, "\\$&");- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Core/Token.cs b/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Core/Token.csdeleted file mode 100644index 92a46c6ad..000000000--- a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Core/Token.cs+++ /dev/null@@ -1,17 +0,0 @@-namespace DevToys.Tools.Helpers.SqlFormatter.Core;--internal struct Token-{- internal readonly int Index { get; }- internal readonly int Length { get; }- internal int PrecedingWitespaceLength { get; set; }- internal readonly TokenType Type { get; }-- public Token(int index, int length, TokenType type, int precedingWitespaceLength = 0)- {- Index = index;- Length = length;- Type = type;- PrecedingWitespaceLength = precedingWitespaceLength;- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Core/TokenHelper.cs b/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Core/TokenHelper.csdeleted file mode 100644index 71f995472..000000000--- a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Core/TokenHelper.cs+++ /dev/null@@ -1,51 +0,0 @@-namespace DevToys.Tools.Helpers.SqlFormatter.Core;--internal static class TokenHelper-{- internal static bool IsAnd(this Token token, ReadOnlySpan<char> tokenValueSpan)- {- return IsToken(token.Type, TokenType.ReservedNewLine, tokenValueSpan, "AND".AsSpan());- }-- internal static bool IsBetween(this Token token, ReadOnlySpan<char> tokenValueSpan)- {- return IsToken(token.Type, TokenType.Reserved, tokenValueSpan, "BETWEEN".AsSpan());- }-- internal static bool IsLimit(this Token token, ReadOnlySpan<char> tokenValueSpan)- {- return IsToken(token.Type, TokenType.ReservedTopLevel, tokenValueSpan, "LIMIT".AsSpan());- }-- internal static bool IsSet(this Token token, ReadOnlySpan<char> tokenValueSpan)- {- return IsToken(token.Type, TokenType.ReservedTopLevel, tokenValueSpan, "SET".AsSpan());- }-- internal static bool IsBy(this Token token, ReadOnlySpan<char> tokenValueSpan)- {- return IsToken(token.Type, TokenType.Reserved, tokenValueSpan, "BY".AsSpan());- }-- internal static bool IsWindow(this Token token, ReadOnlySpan<char> tokenValueSpan)- {- return IsToken(token.Type, TokenType.ReservedTopLevel, tokenValueSpan, "WINDOW".AsSpan());- }-- internal static bool IsEnd(this Token token, ReadOnlySpan<char> tokenValueSpan)- {- return IsToken(token.Type, TokenType.CloseParen, tokenValueSpan, "END".AsSpan());- }-- internal static bool IsValues(this Token token, ReadOnlySpan<char> tokenValueSpan)- {- return IsToken(token.Type, TokenType.ReservedTopLevel, tokenValueSpan, "VALUES".AsSpan());- }-- private static bool IsToken(TokenType type, TokenType otherType,- ReadOnlySpan<char> tokenValueSpan, ReadOnlySpan<char> otherSpan)- {- return type == otherType &&- tokenValueSpan.Equals(otherSpan, StringComparison.OrdinalIgnoreCase);- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Core/TokenType.cs b/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Core/TokenType.csdeleted file mode 100644index 6a2398737..000000000--- a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Core/TokenType.cs+++ /dev/null@@ -1,18 +0,0 @@-namespace DevToys.Tools.Helpers.SqlFormatter.Core;--internal enum TokenType-{- Word,- String,- Reserved,- ReservedTopLevel,- ReservedTopLevelNoIndent,- ReservedNewLine,- Operator,- OpenParen,- CloseParen,- LineComment,- BlockComment,- Number,- PlaceHolder-}diff --git a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Core/Tokenizer.cs b/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Core/Tokenizer.csdeleted file mode 100644index 5e13a6bf1..000000000--- a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Core/Tokenizer.cs+++ /dev/null@@ -1,254 +0,0 @@-using System.Text.RegularExpressions;--namespace DevToys.Tools.Helpers.SqlFormatter.Core;--internal class Tokenizer-{- private static readonly Regex NumberRegex = new(@"^((-\s*)?[0-9]+(\.[0-9]+)?([eE]-?[0-9]+(\.[0-9]+)?)?|0x[0-9a-fA-F]+|0b[01]+)\b", RegexOptions.Compiled, RegexFactory.DefaultMatchTimeout);- private static readonly Regex BlockCommentRegex = new(@"^(\/\*(.*?)*?(?:\*\/|$))", RegexOptions.Singleline | RegexOptions.Compiled, RegexFactory.DefaultMatchTimeout);-- private readonly Regex _operatorRegex;- private readonly Regex _lineCommentRegex;- private readonly Regex _reservedTopLevelRegex;- private readonly Regex _reservedTopLevelNoIndentRegex;- private readonly Regex _reservedNewLineRegex;- private readonly Regex _reservedPlainRegex;- private readonly Regex _wordRegex;- private readonly Regex _stringRegex;- private readonly Regex _openParenRegex;- private readonly Regex _closeParenRegex;- private readonly Regex? _indexedPlaceholderRegex;- private readonly Regex? _indentNamedPlaceholderRegex;-- /// <summary>- /// Initializes a new instance of <see cref="Tokenizer"/> class.- /// </summary>- /// <param name="reservedWords">Reserved words in SQL</param>- /// <param name="reservedTopLevelWords">Words that are set to new line separately</param>- /// <param name="reservedNewlineWords">Words that are set to newline</param>- /// <param name="reservedTopLevelWordsNoIndent">Words that are top level but have no indentation</param>- /// <param name="stringTypes">String types to enable: "", '', ``, [], N''</param>- /// <param name="openParens">Opening parentheses to enable, like (, [</param>- /// <param name="closeParens">Closing parentheses to enable, like ), ]</param>- /// <param name="indexedPlaceholderTypes">Prefixes for indexed placeholders, like ?</param>- /// <param name="namedPlaceholderTypes">Prefixes for named placeholders, like @ and :</param>- /// <param name="lineCommentTypes">Line comments to enable, like # and --</param>- /// <param name="specialWordChars">Special chars that can be found inside of words, like @ and #</param>- /// <param name="operators">Additional operators to recognize</param>- public Tokenizer(- string[] reservedWords,- string[] reservedTopLevelWords,- string[] reservedNewlineWords,- string[] reservedTopLevelWordsNoIndent,- string[] stringTypes,- string[] openParens,- string[] closeParens,- char[] indexedPlaceholderTypes,- char[] namedPlaceholderTypes,- string[] lineCommentTypes,- string[] specialWordChars,- string[]? operators = null)- {- var operatorsParam = new List<string> { "<>", "<=", ">=", "&&", "||", "!=" };- if (operators is not null)- {- operatorsParam.AddRange(operators);- }- _operatorRegex = RegexFactory.CreateOperatorRegex(operatorsParam);-- _lineCommentRegex = RegexFactory.CreateLineCommentRegex(lineCommentTypes);- _reservedTopLevelRegex = RegexFactory.CreateReservedWordRegex(reservedTopLevelWords);- _reservedTopLevelNoIndentRegex = RegexFactory.CreateReservedWordRegex(reservedTopLevelWordsNoIndent);- _reservedNewLineRegex = RegexFactory.CreateReservedWordRegex(reservedNewlineWords);- _reservedPlainRegex = RegexFactory.CreateReservedWordRegex(reservedWords);- _wordRegex = RegexFactory.CreateWordRegex(specialWordChars);- _stringRegex = RegexFactory.CreateStringRegex(stringTypes);- _openParenRegex = RegexFactory.CreateParenRegex(openParens);- _closeParenRegex = RegexFactory.CreateParenRegex(closeParens);- _indexedPlaceholderRegex = RegexFactory.CreatePlaceholderRegex(indexedPlaceholderTypes, "[0-9]*");- _indentNamedPlaceholderRegex = RegexFactory.CreatePlaceholderRegex(namedPlaceholderTypes, "[a-zA-Z0-9._$]+");- }-- /// <summary>- /// Takes a SQL string and breaks it into tokens.- /// </summary>- /// <param name="input">The SQL string</param>- /// <returns></returns>- internal IReadOnlyList<Token> Tokenize(string input)- {- var tokens = new List<Token>();- Token? token = null;- int pointerIndex = 0;-- // Keep processing the string until it is empty- while (pointerIndex != input.Length)- {- // grab any preceding whitespace length- int precedingWhitespaceLength = GetPrecedingWhitespaceLength(input, pointerIndex);-- pointerIndex += precedingWhitespaceLength;-- if (pointerIndex != input.Length)- {- // Get the next token and the token type- token = GetNextToken(input, pointerIndex, previousToken: token);-- if (token is not null)- {- Token t = token.Value;- // Advance the index pointer string- pointerIndex += t.Length;- t.PrecedingWitespaceLength = precedingWhitespaceLength;- tokens.Add(t);- }- }- }-- return tokens;- }-- private static int GetPrecedingWhitespaceLength(string input, int pointerIndex)- {- int i = 0;- int len = input.Length - pointerIndex;- for (; i < len; i++)- {- if (!char.IsWhiteSpace(input[i + pointerIndex]))- {- break;- }- }- return i;- }-- private Token? GetNextToken(string input, int pointerIndex, Token? previousToken)- {- return GetCommentToken(input, pointerIndex)- ?? GetStringToken(input, pointerIndex)- ?? GetOpenParenToken(input, pointerIndex)- ?? GetCloseParenToken(input, pointerIndex)- ?? GetPlaceholderToken(input, pointerIndex)- ?? GetNumberToken(input, pointerIndex)- ?? GetReservedWordToken(input, pointerIndex, previousToken)- ?? GetWordToken(input, pointerIndex)- ?? GetOperatorToken(input, pointerIndex);- }-- private Token? GetCommentToken(string input, int pointerIndex)- {- return GetLineCommentToken(input, pointerIndex)- ?? GetBlockCommentToken(input, pointerIndex);- }-- private Token? GetLineCommentToken(string input, int pointerIndex)- {- return GetTokenOnFirstMatch(input, pointerIndex, TokenType.LineComment, _lineCommentRegex);- }-- private static Token? GetBlockCommentToken(string input, int pointerIndex)- {- return GetTokenOnFirstMatch(input, pointerIndex, TokenType.BlockComment, BlockCommentRegex);- }-- private Token? GetStringToken(string input, int pointerIndex)- {- return GetTokenOnFirstMatch(input, pointerIndex, TokenType.String, _stringRegex);- }-- private Token? GetOpenParenToken(string input, int pointerIndex)- {- return GetTokenOnFirstMatch(input, pointerIndex, TokenType.OpenParen, _openParenRegex);- }-- private Token? GetCloseParenToken(string input, int pointerIndex)- {- return GetTokenOnFirstMatch(input, pointerIndex, TokenType.CloseParen, _closeParenRegex);- }-- private Token? GetPlaceholderToken(string input, int pointerIndex)- {- return GetIdentNamedPlaceholderToken(input, pointerIndex)- ?? GetIndexedPlaceholderToken(input, pointerIndex);- }-- private Token? GetIdentNamedPlaceholderToken(string input, int pointerIndex)- {- return GetPlaceholderTokenWithKey(input, pointerIndex, _indentNamedPlaceholderRegex);- }-- private Token? GetIndexedPlaceholderToken(string input, int pointerIndex)- {- return GetPlaceholderTokenWithKey(input, pointerIndex, _indexedPlaceholderRegex);- }-- private static Token? GetPlaceholderTokenWithKey(string input, int pointerIndex, Regex? regex)- {- return GetTokenOnFirstMatch(input, pointerIndex, TokenType.PlaceHolder, regex);- }-- private static Token? GetNumberToken(string input, int pointerIndex)- {- // Decimal, binary, or hex numbers- return GetTokenOnFirstMatch(input, pointerIndex, TokenType.Number, NumberRegex);- }-- private Token? GetWordToken(string input, int pointerIndex)- {- return GetTokenOnFirstMatch(input, pointerIndex, TokenType.Word, _wordRegex);- }-- private Token? GetOperatorToken(string input, int pointerIndex)- {- // Punctuation and symbols- return GetTokenOnFirstMatch(input, pointerIndex, TokenType.Operator, _operatorRegex);- }-- private Token? GetReservedWordToken(string input, int pointerIndex, Token? previousToken)- {- // A reserved word cannot be preceded by a "."- // this makes it so in "mytable.from", "from" is not considered a reserved word- if (previousToken is not null- && previousToken.Value.Length == 1- && input[previousToken.Value.Index] == '.')- {- return null;- }-- return GetTopLevelReservedToken(input, pointerIndex)- ?? GetNewlineReservedToken(input, pointerIndex)- ?? GetTopLevelReservedTokenNoIndent(input, pointerIndex)- ?? GetPlainReservedToken(input, pointerIndex);- }-- private Token? GetTopLevelReservedToken(string input, int pointerIndex)- {- return GetTokenOnFirstMatch(input, pointerIndex, TokenType.ReservedTopLevel, _reservedTopLevelRegex);- }-- private Token? GetNewlineReservedToken(string input, int pointerIndex)- {- return GetTokenOnFirstMatch(input, pointerIndex, TokenType.ReservedNewLine, _reservedNewLineRegex);- }-- private Token? GetTopLevelReservedTokenNoIndent(string input, int pointerIndex)- {- return GetTokenOnFirstMatch(input, pointerIndex, TokenType.ReservedTopLevelNoIndent, _reservedTopLevelNoIndentRegex);- }-- private Token? GetPlainReservedToken(string input, int pointerIndex)- {- return GetTokenOnFirstMatch(input, pointerIndex, TokenType.Reserved, _reservedPlainRegex);- }-- private static Token? GetTokenOnFirstMatch(string input, int pointerIndex, TokenType type, Regex? regex)- {- if (regex is null)- {- return null;- }-- Match match = regex.Match(input, pointerIndex, input.Length - pointerIndex);-- return match.Success ? new Token(pointerIndex, match.Length, type) : null;- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Languages/Db2Formatter.cs b/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Languages/Db2Formatter.csdeleted file mode 100644index cd8c7dedd..000000000--- a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Languages/Db2Formatter.cs+++ /dev/null@@ -1,578 +0,0 @@-using DevToys.Tools.Helpers.SqlFormatter.Core;--namespace DevToys.Tools.Helpers.SqlFormatter.Languages;--internal sealed class Db2Formatter : Formatter-{- private static readonly string[] ReservedWords- =- {- "ABS",- "ACTIVATE",- "ALIAS",- "ALL",- "ALLOCATE",- "ALLOW",- "ALTER",- "ANY",- "ARE",- "ARRAY",- "AS",- "ASC",- "ASENSITIVE",- "ASSOCIATE",- "ASUTIME",- "ASYMMETRIC",- "AT",- "ATOMIC",- "ATTRIBUTES",- "AUDIT",- "AUTHORIZATION",- "AUX",- "AUXILIARY",- "AVG",- "BEFORE",- "BEGIN",- "BETWEEN",- "BIGINT",- "BINARY",- "BLOB",- "BOOLEAN",- "BOTH",- "BUFFERPOOL",- "BY",- "CACHE",- "CALL",- "CALLED",- "CAPTURE",- "CARDINALITY",- "CASCADED",- "CASE",- "CAST",- "CCSID",- "CEIL",- "CEILING",- "CHAR",- "CHARACTER",- "CHARACTER_LENGTH",- "CHAR_LENGTH",- "CHECK",- "CLOB",- "CLONE",- "CLOSE",- "CLUSTER",- "COALESCE",- "COLLATE",- "COLLECT",- "COLLECTION",- "COLLID",- "COLUMN",- "COMMENT",- "COMMIT",- "CONCAT",- "CONDITION",- "CONNECT",- "CONNECTION",- "CONSTRAINT",- "CONTAINS",- "CONTINUE",- "CONVERT",- "CORR",- "CORRESPONDING",- "COUNT",- "COUNT_BIG",- "COVAR_POP",- "COVAR_SAMP",- "CREATE",- "CROSS",- "CUBE",- "CUME_DIST",- "CURRENT",- "CURRENT_DATE",- "CURRENT_DEFAULT_TRANSFORM_GROUP",- "CURRENT_LC_CTYPE",- "CURRENT_PATH",- "CURRENT_ROLE",- "CURRENT_SCHEMA",- "CURRENT_SERVER",- "CURRENT_TIME",- "CURRENT_TIMESTAMP",- "CURRENT_TIMEZONE",- "CURRENT_TRANSFORM_GROUP_FOR_TYPE",- "CURRENT_USER",- "CURSOR",- "CYCLE",- "DATA",- "DATABASE",- "DATAPARTITIONNAME",- "DATAPARTITIONNUM",- "DATE",- "DAY",- "DAYS",- "DB2GENERAL",- "DB2GENRL",- "DB2SQL",- "DBINFO",- "DBPARTITIONNAME",- "DBPARTITIONNUM",- "DEALLOCATE",- "DEC",- "DECIMAL",- "DECLARE",- "DEFAULT",- "DEFAULTS",- "DEFINITION",- "DELETE",- "DENSERANK",- "DENSE_RANK",- "DEREF",- "DESCRIBE",- "DESCRIPTOR",- "DETERMINISTIC",- "DIAGNOSTICS",- "DISABLE",- "DISALLOW",- "DISCONNECT",- "DISTINCT",- "DO",- "DOCUMENT",- "DOUBLE",- "DROP",- "DSSIZE",- "DYNAMIC",- "EACH",- "EDITPROC",- "ELEMENT",- "ELSE",- "ELSEIF",- "ENABLE",- "ENCODING",- "ENCRYPTION",- "END",- "END-EXEC",- "ENDING",- "ERASE",- "ESCAPE",- "EVERY",- "EXCEPTION",- "EXCLUDING",- "EXCLUSIVE",- "EXEC",- "EXECUTE",- "EXISTS",- "EXIT",- "EXP",- "EXPLAIN",- "EXTENDED",- "EXTERNAL",- "EXTRACT",- "FALSE",- "FENCED",- "FETCH",- "FIELDPROC",- "FILE",- "FILTER",- "FINAL",- "FIRST",- "FLOAT",- "FLOOR",- "FOR",- "FOREIGN",- "FREE",- "FULL",- "FUNCTION",- "FUSION",- "GENERAL",- "GENERATED",- "GET",- "GLOBAL",- "GOTO",- "GRANT",- "GRAPHIC",- "GROUP",- "GROUPING",- "HANDLER",- "HASH",- "HASHED_VALUE",- "HINT",- "HOLD",- "HOUR",- "HOURS",- "IDENTITY",- "IF",- "IMMEDIATE",- "IN",- "INCLUDING",- "INCLUSIVE",- "INCREMENT",- "INDEX",- "INDICATOR",- "INDICATORS",- "INF",- "INFINITY",- "INHERIT",- "INNER",- "INOUT",- "INSENSITIVE",- "INSERT",- "INT",- "INTEGER",- "INTEGRITY",- "INTERSECTION",- "INTERVAL",- "INTO",- "IS",- "ISOBID",- "ISOLATION",- "ITERATE",- "JAR",- "JAVA",- "KEEP",- "KEY",- "LABEL",- "LANGUAGE",- "LARGE",- "LATERAL",- "LC_CTYPE",- "LEADING",- "LEAVE",- "LEFT",- "LIKE",- "LINKTYPE",- "LN",- "LOCAL",- "LOCALDATE",- "LOCALE",- "LOCALTIME",- "LOCALTIMESTAMP",- "LOCATOR",- "LOCATORS",- "LOCK",- "LOCKMAX",- "LOCKSIZE",- "LONG",- "LOOP",- "LOWER",- "MAINTAINED",- "MATCH",- "MATERIALIZED",- "MAX",- "MAXVALUE",- "MEMBER",- "MERGE",- "METHOD",- "MICROSECOND",- "MICROSECONDS",- "MIN",- "MINUTE",- "MINUTES",- "MINVALUE",- "MOD",- "MODE",- "MODIFIES",- "MODULE",- "MONTH",- "MONTHS",- "MULTISET",- "NAN",- "NATIONAL",- "NATURAL",- "NCHAR",- "NCLOB",- "NEW",- "NEW_TABLE",- "NEXTVAL",- "NO",- "NOCACHE",- "NOCYCLE",- "NODENAME",- "NODENUMBER",- "NOMAXVALUE",- "NOMINVALUE",- "NONE",- "NOORDER",- "NORMALIZE",- "NORMALIZED",- "NOT",- "NULL",- "NULLIF",- "NULLS",- "NUMERIC",- "NUMPARTS",- "OBID",- "OCTET_LENGTH",- "OF",- "OFFSET",- "OLD",- "OLD_TABLE",- "ON",- "ONLY",- "OPEN",- "OPTIMIZATION",- "OPTIMIZE",- "OPTION",- "ORDER",- "OUT",- "OUTER",- "OVER",- "OVERLAPS",- "OVERLAY",- "OVERRIDING",- "PACKAGE",- "PADDED",- "PAGESIZE",- "PARAMETER",- "PART",- "PARTITION",- "PARTITIONED",- "PARTITIONING",- "PARTITIONS",- "PASSWORD",- "PATH",- "PERCENTILE_CONT",- "PERCENTILE_DISC",- "PERCENT_RANK",- "PIECESIZE",- "PLAN",- "POSITION",- "POWER",- "PRECISION",- "PREPARE",- "PREVVAL",- "PRIMARY",- "PRIQTY",- "PRIVILEGES",- "PROCEDURE",- "PROGRAM",- "PSID",- "PUBLIC",- "QUERY",- "QUERYNO",- "RANGE",- "RANK",- "READ",- "READS",- "REAL",- "RECOVERY",- "RECURSIVE",- "REF",- "REFERENCES",- "REFERENCING",- "REFRESH",- "REGR_AVGX",- "REGR_AVGY",- "REGR_COUNT",- "REGR_INTERCEPT",- "REGR_R2",- "REGR_SLOPE",- "REGR_SXX",- "REGR_SXY",- "REGR_SYY",- "RELEASE",- "RENAME",- "REPEAT",- "RESET",- "RESIGNAL",- "RESTART",- "RESTRICT",- "RESULT",- "RESULT_SET_LOCATOR",- "RETURN",- "RETURNS",- "REVOKE",- "RIGHT",- "ROLE",- "ROLLBACK",- "ROLLUP",- "ROUND_CEILING",- "ROUND_DOWN",- "ROUND_FLOOR",- "ROUND_HALF_DOWN",- "ROUND_HALF_EVEN",- "ROUND_HALF_UP",- "ROUND_UP",- "ROUTINE",- "ROW",- "ROWNUMBER",- "ROWS",- "ROWSET",- "ROW_NUMBER",- "RRN",- "RUN",- "SAVEPOINT",- "SCHEMA",- "SCOPE",- "SCRATCHPAD",- "SCROLL",- "SEARCH",- "SECOND",- "SECONDS",- "SECQTY",- "SECURITY",- "SENSITIVE",- "SEQUENCE",- "SESSION",- "SESSION_USER",- "SIGNAL",- "SIMILAR",- "SIMPLE",- "SMALLINT",- "SNAN",- "SOME",- "SOURCE",- "SPECIFIC",- "SPECIFICTYPE",- "SQL",- "SQLEXCEPTION",- "SQLID",- "SQLSTATE",- "SQLWARNING",- "SQRT",- "STACKED",- "STANDARD",- "START",- "STARTING",- "STATEMENT",- "STATIC",- "STATMENT",- "STAY",- "STDDEV_POP",- "STDDEV_SAMP",- "STOGROUP",- "STORES",- "STYLE",- "SUBMULTISET",- "SUBSTRING",- "SUM",- "SUMMARY",- "SYMMETRIC",- "SYNONYM",- "SYSFUN",- "SYSIBM",- "SYSPROC",- "SYSTEM",- "SYSTEM_USER",- "TABLE",- "TABLESAMPLE",- "TABLESPACE",- "THEN",- "TIME",- "TIMESTAMP",- "TIMEZONE_HOUR",- "TIMEZONE_MINUTE",- "TO",- "TRAILING",- "TRANSACTION",- "TRANSLATE",- "TRANSLATION",- "TREAT",- "TRIGGER",- "TRIM",- "TRUE",- "TRUNCATE",- "TYPE",- "UESCAPE",- "UNDO",- "UNIQUE",- "UNKNOWN",- "UNNEST",- "UNTIL",- "UPPER",- "USAGE",- "USER",- "USING",- "VALIDPROC",- "VALUE",- "VARCHAR",- "VARIABLE",- "VARIANT",- "VARYING",- "VAR_POP",- "VAR_SAMP",- "VCAT",- "VERSION",- "VIEW",- "VOLATILE",- "VOLUMES",- "WHEN",- "WHENEVER",- "WHILE",- "WIDTH_BUCKET",- "WINDOW",- "WITH",- "WITHIN",- "WITHOUT",- "WLM",- "WRITE",- "XMLELEMENT",- "XMLEXISTS",- "XMLNAMESPACES",- "YEAR",- "YEARS",- };-- private static readonly string[] ReservedTopLevelWords- =- {- "ADD",- "AFTER",- "ALTER COLUMN",- "ALTER TABLE",- "DELETE FROM",- "EXCEPT",- "FETCH FIRST",- "FROM",- "GROUP BY",- "GO",- "HAVING",- "INSERT INTO",- "INTERSECT",- "LIMIT",- "ORDER BY",- "SELECT",- "SET CURRENT SCHEMA",- "SET SCHEMA",- "SET",- "UPDATE",- "VALUES",- "WHERE",- };-- private static readonly string[] ReservedTopLevelWordsNoIndent = new[] { "INTERSECT", "INTERSECT ALL", "MINUS", "UNION", "UNION ALL" };-- private static readonly string[] ReservedNewlineWords- =- {- "AND",- "OR",- // joins- "JOIN",- "INNER JOIN",- "LEFT JOIN",- "LEFT OUTER JOIN",- "RIGHT JOIN",- "RIGHT OUTER JOIN",- "FULL JOIN",- "FULL OUTER JOIN",- "CROSS JOIN",- "NATURAL JOIN"- };-- protected override Tokenizer GetTokenizer()- {- return- new Tokenizer(- ReservedWords,- ReservedTopLevelWords,- ReservedNewlineWords,- ReservedTopLevelWordsNoIndent,- stringTypes: new[] { "\"\"", "''", "``", "[]" },- openParens: new[] { "(" },- closeParens: new[] { ")" },- indexedPlaceholderTypes: new[] { '?' },- namedPlaceholderTypes: new[] { ':' },- lineCommentTypes: new[] { "--" },- specialWordChars: new[] { "#", "@" },- operators: new[] { "**", "!=", "!>", "!>", "||" });- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Languages/MariaDbFormatter.cs b/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Languages/MariaDbFormatter.csdeleted file mode 100644index bc1dc5ef7..000000000--- a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Languages/MariaDbFormatter.cs+++ /dev/null@@ -1,325 +0,0 @@-using DevToys.Tools.Helpers.SqlFormatter.Core;--namespace DevToys.Tools.Helpers.SqlFormatter.Languages;--internal sealed class MariaDbFormatter : Formatter-{- private static readonly string[] ReservedWords- =- {- "ACCESSIBLE",- "ADD",- "ALL",- "ALTER",- "ANALYZE",- "AND",- "AS",- "ASC",- "ASENSITIVE",- "BEFORE",- "BETWEEN",- "BIGINT",- "BINARY",- "BLOB",- "BOTH",- "BY",- "CALL",- "CASCADE",- "CASE",- "CHANGE",- "CHAR",- "CHARACTER",- "CHECK",- "COLLATE",- "COLUMN",- "CONDITION",- "CONSTRAINT",- "CONTINUE",- "CONVERT",- "CREATE",- "CROSS",- "CURRENT_DATE",- "CURRENT_ROLE",- "CURRENT_TIME",- "CURRENT_TIMESTAMP",- "CURRENT_USER",- "CURSOR",- "DATABASE",- "DATABASES",- "DAY_HOUR",- "DAY_MICROSECOND",- "DAY_MINUTE",- "DAY_SECOND",- "DEC",- "DECIMAL",- "DECLARE",- "DEFAULT",- "DELAYED",- "DELETE",- "DESC",- "DESCRIBE",- "DETERMINISTIC",- "DISTINCT",- "DISTINCTROW",- "DIV",- "DO_DOMAIN_IDS",- "DOUBLE",- "DROP",- "DUAL",- "EACH",- "ELSE",- "ELSEIF",- "ENCLOSED",- "ESCAPED",- "EXCEPT",- "EXISTS",- "EXIT",- "EXPLAIN",- "FALSE",- "FETCH",- "FLOAT",- "FLOAT4",- "FLOAT8",- "FOR",- "FORCE",- "FOREIGN",- "FROM",- "FULLTEXT",- "GENERAL",- "GRANT",- "GROUP",- "HAVING",- "HIGH_PRIORITY",- "HOUR_MICROSECOND",- "HOUR_MINUTE",- "HOUR_SECOND",- "IF",- "IGNORE",- "IGNORE_DOMAIN_IDS",- "IGNORE_SERVER_IDS",- "IN",- "INDEX",- "INFILE",- "INNER",- "INOUT",- "INSENSITIVE",- "INSERT",- "INT",- "INT1",- "INT2",- "INT3",- "INT4",- "INT8",- "INTEGER",- "INTERSECT",- "INTERVAL",- "INTO",- "IS",- "ITERATE",- "JOIN",- "KEY",- "KEYS",- "KILL",- "LEADING",- "LEAVE",- "LEFT",- "LIKE",- "LIMIT",- "LINEAR",- "LINES",- "LOAD",- "LOCALTIME",- "LOCALTIMESTAMP",- "LOCK",- "LONG",- "LONGBLOB",- "LONGTEXT",- "LOOP",- "LOW_PRIORITY",- "MASTER_HEARTBEAT_PERIOD",- "MASTER_SSL_VERIFY_SERVER_CERT",- "MATCH",- "MAXVALUE",- "MEDIUMBLOB",- "MEDIUMINT",- "MEDIUMTEXT",- "MIDDLEINT",- "MINUTE_MICROSECOND",- "MINUTE_SECOND",- "MOD",- "MODIFIES",- "NATURAL",- "NOT",- "NO_WRITE_TO_BINLOG",- "NULL",- "NUMERIC",- "ON",- "OPTIMIZE",- "OPTION",- "OPTIONALLY",- "OR",- "ORDER",- "OUT",- "OUTER",- "OUTFILE",- "OVER",- "PAGE_CHECKSUM",- "PARSE_VCOL_EXPR",- "PARTITION",- "POSITION",- "PRECISION",- "PRIMARY",- "PROCEDURE",- "PURGE",- "RANGE",- "READ",- "READS",- "READ_WRITE",- "REAL",- "RECURSIVE",- "REF_SYSTEM_ID",- "REFERENCES",- "REGEXP",- "RELEASE",- "RENAME",- "REPEAT",- "REPLACE",- "REQUIRE",- "RESIGNAL",- "RESTRICT",- "RETURN",- "RETURNING",- "REVOKE",- "RIGHT",- "RLIKE",- "ROWS",- "SCHEMA",- "SCHEMAS",- "SECOND_MICROSECOND",- "SELECT",- "SENSITIVE",- "SEPARATOR",- "SET",- "SHOW",- "SIGNAL",- "SLOW",- "SMALLINT",- "SPATIAL",- "SPECIFIC",- "SQL",- "SQLEXCEPTION",- "SQLSTATE",- "SQLWARNING",- "SQL_BIG_RESULT",- "SQL_CALC_FOUND_ROWS",- "SQL_SMALL_RESULT",- "SSL",- "STARTING",- "STATS_AUTO_RECALC",- "STATS_PERSISTENT",- "STATS_SAMPLE_PAGES",- "STRAIGHT_JOIN",- "TABLE",- "TERMINATED",- "THEN",- "TINYBLOB",- "TINYINT",- "TINYTEXT",- "TO",- "TRAILING",- "TRIGGER",- "TRUE",- "UNDO",- "UNION",- "UNIQUE",- "UNLOCK",- "UNSIGNED",- "UPDATE",- "USAGE",- "USE",- "USING",- "UTC_DATE",- "UTC_TIME",- "UTC_TIMESTAMP",- "VALUES",- "VARBINARY",- "VARCHAR",- "VARCHARACTER",- "VARYING",- "WHEN",- "WHERE",- "WHILE",- "WINDOW",- "WITH",- "WRITE",- "XOR",- "YEAR_MONTH",- "ZEROFILL",- };-- private static readonly string[] ReservedTopLevelWords- =- {- "ADD",- "ALTER COLUMN",- "ALTER TABLE",- "DELETE FROM",- "EXCEPT",- "FROM",- "GROUP BY",- "HAVING",- "INSERT INTO",- "INSERT",- "LIMIT",- "ORDER BY",- "SELECT",- "SET",- "UPDATE",- "VALUES",- "WHERE",- };-- private static readonly string[] ReservedTopLevelWordsNoIndent = new[] { "INTERSECT", "INTERSECT ALL", "UNION", "UNION ALL" };-- private static readonly string[] ReservedNewlineWords- =- {- "AND",- "ELSE",- "OR",- "WHEN",- // joins- "JOIN",- "INNER JOIN",- "LEFT JOIN",- "LEFT OUTER JOIN",- "RIGHT JOIN",- "RIGHT OUTER JOIN",- "CROSS JOIN",- "NATURAL JOIN",- // non-standard joins- "STRAIGHT_JOIN",- "NATURAL LEFT JOIN",- "NATURAL LEFT OUTER JOIN",- "NATURAL RIGHT JOIN",- "NATURAL RIGHT OUTER JOIN"- };-- protected override Tokenizer GetTokenizer()- {- return- new Tokenizer(- ReservedWords,- ReservedTopLevelWords,- ReservedNewlineWords,- ReservedTopLevelWordsNoIndent,- stringTypes: new[] { "\"\"", "''", "``" },- openParens: new[] { "(", "CASE" },- closeParens: new[] { ")", "END" },- indexedPlaceholderTypes: new[] { '?' },- namedPlaceholderTypes: Array.Empty<char>(),- lineCommentTypes: new[] { "#", "--" },- specialWordChars: new[] { "#", "@", "$" },- operators: new[] { ":=", "<<", ">>", "!=", "<>", "<=>", "&&", "||" });- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Languages/MySqlFormatter.cs b/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Languages/MySqlFormatter.csdeleted file mode 100644index 32c72a843..000000000--- a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Languages/MySqlFormatter.cs+++ /dev/null@@ -1,338 +0,0 @@-using DevToys.Tools.Helpers.SqlFormatter.Core;--namespace DevToys.Tools.Helpers.SqlFormatter.Languages;--internal sealed class MySqlFormatter : Formatter-{- private static readonly string[] ReservedWords- =- {- "ACCESSIBLE",- "ADD",- "ALL",- "ALTER",- "ANALYZE",- "AND",- "AS",- "ASC",- "ASENSITIVE",- "BEFORE",- "BETWEEN",- "BIGINT",- "BINARY",- "BLOB",- "BOTH",- "BY",- "CALL",- "CASCADE",- "CASE",- "CHANGE",- "CHAR",- "CHARACTER",- "CHECK",- "COLLATE",- "COLUMN",- "CONDITION",- "CONSTRAINT",- "CONTINUE",- "CONVERT",- "CREATE",- "CROSS",- "CUBE",- "CUME_DIST",- "CURRENT_DATE",- "CURRENT_TIME",- "CURRENT_TIMESTAMP",- "CURRENT_USER",- "CURSOR",- "DATABASE",- "DATABASES",- "DAY_HOUR",- "DAY_MICROSECOND",- "DAY_MINUTE",- "DAY_SECOND",- "DEC",- "DECIMAL",- "DECLARE",- "DEFAULT",- "DELAYED",- "DELETE",- "DENSE_RANK",- "DESC",- "DESCRIBE",- "DETERMINISTIC",- "DISTINCT",- "DISTINCTROW",- "DIV",- "DOUBLE",- "DROP",- "DUAL",- "EACH",- "ELSE",- "ELSEIF",- "EMPTY",- "ENCLOSED",- "ESCAPED",- "EXCEPT",- "EXISTS",- "EXIT",- "EXPLAIN",- "FALSE",- "FETCH",- "FIRST_VALUE",- "FLOAT",- "FLOAT4",- "FLOAT8",- "FOR",- "FORCE",- "FOREIGN",- "FROM",- "FULLTEXT",- "FUNCTION",- "GENERATED",- "GET",- "GRANT",- "GROUP",- "GROUPING",- "GROUPS",- "HAVING",- "HIGH_PRIORITY",- "HOUR_MICROSECOND",- "HOUR_MINUTE",- "HOUR_SECOND",- "IF",- "IGNORE",- "IN",- "INDEX",- "INFILE",- "INNER",- "INOUT",- "INSENSITIVE",- "INSERT",- "INT",- "INT1",- "INT2",- "INT3",- "INT4",- "INT8",- "INTEGER",- "INTERVAL",- "INTO",- "IO_AFTER_GTIDS",- "IO_BEFORE_GTIDS",- "IS",- "ITERATE",- "JOIN",- "JSON_TABLE",- "KEY",- "KEYS",- "KILL",- "LAG",- "LAST_VALUE",- "LATERAL",- "LEAD",- "LEADING",- "LEAVE",- "LEFT",- "LIKE",- "LIMIT",- "LINEAR",- "LINES",- "LOAD",- "LOCALTIME",- "LOCALTIMESTAMP",- "LOCK",- "LONG",- "LONGBLOB",- "LONGTEXT",- "LOOP",- "LOW_PRIORITY",- "MASTER_BIND",- "MASTER_SSL_VERIFY_SERVER_CERT",- "MATCH",- "MAXVALUE",- "MEDIUMBLOB",- "MEDIUMINT",- "MEDIUMTEXT",- "MIDDLEINT",- "MINUTE_MICROSECOND",- "MINUTE_SECOND",- "MOD",- "MODIFIES",- "NATURAL",- "NOT",- "NO_WRITE_TO_BINLOG",- "NTH_VALUE",- "NTILE",- "NULL",- "NUMERIC",- "OF",- "ON",- "OPTIMIZE",- "OPTIMIZER_COSTS",- "OPTION",- "OPTIONALLY",- "OR",- "ORDER",- "OUT",- "OUTER",- "OUTFILE",- "OVER",- "PARTITION",- "PERCENT_RANK",- "PRECISION",- "PRIMARY",- "PROCEDURE",- "PURGE",- "RANGE",- "RANK",- "READ",- "READS",- "READ_WRITE",- "REAL",- "RECURSIVE",- "REFERENCES",- "REGEXP",- "RELEASE",- "RENAME",- "REPEAT",- "REPLACE",- "REQUIRE",- "RESIGNAL",- "RESTRICT",- "RETURN",- "REVOKE",- "RIGHT",- "RLIKE",- "ROW",- "ROWS",- "ROW_NUMBER",- "SCHEMA",- "SCHEMAS",- "SECOND_MICROSECOND",- "SELECT",- "SENSITIVE",- "SEPARATOR",- "SET",- "SHOW",- "SIGNAL",- "SMALLINT",- "SPATIAL",- "SPECIFIC",- "SQL",- "SQLEXCEPTION",- "SQLSTATE",- "SQLWARNING",- "SQL_BIG_RESULT",- "SQL_CALC_FOUND_ROWS",- "SQL_SMALL_RESULT",- "SSL",- "STARTING",- "STORED",- "STRAIGHT_JOIN",- "SYSTEM",- "TABLE",- "TERMINATED",- "THEN",- "TINYBLOB",- "TINYINT",- "TINYTEXT",- "TO",- "TRAILING",- "TRIGGER",- "TRUE",- "UNDO",- "UNION",- "UNIQUE",- "UNLOCK",- "UNSIGNED",- "UPDATE",- "USAGE",- "USE",- "USING",- "UTC_DATE",- "UTC_TIME",- "UTC_TIMESTAMP",- "VALUES",- "VARBINARY",- "VARCHAR",- "VARCHARACTER",- "VARYING",- "VIRTUAL",- "WHEN",- "WHERE",- "WHILE",- "WINDOW",- "WITH",- "WRITE",- "XOR",- "YEAR_MONTH",- "ZEROFILL",- };-- private static readonly string[] ReservedTopLevelWords- =- {- "ADD",- "ALTER COLUMN",- "ALTER TABLE",- "DELETE FROM",- "EXCEPT",- "FROM",- "GROUP BY",- "HAVING",- "INSERT INTO",- "INSERT",- "LIMIT",- "ORDER BY",- "SELECT",- "SET",- "UPDATE",- "VALUES",- "WHERE",- };-- private static readonly string[] ReservedTopLevelWordsNoIndent = new[] { "INTERSECT", "INTERSECT ALL", "UNION", "UNION ALL" };-- private static readonly string[] ReservedNewlineWords- =- {- "AND",- "ELSE",- "OR",- "WHEN",- // joins- "JOIN",- "INNER JOIN",- "LEFT JOIN",- "LEFT OUTER JOIN",- "RIGHT JOIN",- "RIGHT OUTER JOIN",- "CROSS JOIN",- "NATURAL JOIN",- // non-standard joins- "STRAIGHT_JOIN",- "NATURAL LEFT JOIN",- "NATURAL LEFT OUTER JOIN",- "NATURAL RIGHT JOIN",- "NATURAL RIGHT OUTER JOIN",- };-- protected override Tokenizer GetTokenizer()- {- return- new Tokenizer(- ReservedWords,- ReservedTopLevelWords,- ReservedNewlineWords,- ReservedTopLevelWordsNoIndent,- stringTypes: new[] { "\"\"", "''", "``" },- openParens: new[] { "(", "CASE" },- closeParens: new[] { ")", "END" },- indexedPlaceholderTypes: new[] { '?' },- namedPlaceholderTypes: Array.Empty<char>(),- lineCommentTypes: new[] { "#", "--" },- specialWordChars: new[] { "#", "@", "$" },- operators: new[] { ":=", "<<", ">>", "!=", "<>", "<=>", "&&", "||", "->", "->>" });- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Languages/N1qlFormatter.cs b/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Languages/N1qlFormatter.csdeleted file mode 100644index 5845414ef..000000000--- a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Languages/N1qlFormatter.cs+++ /dev/null@@ -1,249 +0,0 @@-using DevToys.Tools.Helpers.SqlFormatter.Core;--namespace DevToys.Tools.Helpers.SqlFormatter.Languages;--// For reference: http://docs.couchbase.com.s3-website-us-west-1.amazonaws.com/server/6.0/n1ql/n1ql-language-reference/index.html-internal sealed class N1qlFormatter : Formatter-{- private static readonly string[] ReservedWords- =- {- "ALL",- "ALTER",- "ANALYZE",- "AND",- "ANY",- "ARRAY",- "AS",- "ASC",- "BEGIN",- "BETWEEN",- "BINARY",- "BOOLEAN",- "BREAK",- "BUCKET",- "BUILD",- "BY",- "CALL",- "CASE",- "CAST",- "CLUSTER",- "COLLATE",- "COLLECTION",- "COMMIT",- "CONNECT",- "CONTINUE",- "CORRELATE",- "COVER",- "CREATE",- "DATABASE",- "DATASET",- "DATASTORE",- "DECLARE",- "DECREMENT",- "DELETE",- "DERIVED",- "DESC",- "DESCRIBE",- "DISTINCT",- "DO",- "DROP",- "EACH",- "ELEMENT",- "ELSE",- "END",- "EVERY",- "EXCEPT",- "EXCLUDE",- "EXECUTE",- "EXISTS",- "EXPLAIN",- "FALSE",- "FETCH",- "FIRST",- "FLATTEN",- "FOR",- "FORCE",- "FROM",- "FUNCTION",- "GRANT",- "GROUP",- "GSI",- "HAVING",- "IF",- "IGNORE",- "ILIKE",- "IN",- "INCLUDE",- "INCREMENT",- "INDEX",- "INFER",- "INLINE",- "INNER",- "INSERT",- "INTERSECT",- "INTO",- "IS",- "JOIN",- "KEY",- "KEYS",- "KEYSPACE",- "KNOWN",- "LAST",- "LEFT",- "LET",- "LETTING",- "LIKE",- "LIMIT",- "LSM",- "MAP",- "MAPPING",- "MATCHED",- "MATERIALIZED",- "MERGE",- "MISSING",- "NAMESPACE",- "NEST",- "NOT",- "NULL",- "NUMBER",- "OBJECT",- "OFFSET",- "ON",- "OPTION",- "OR",- "ORDER",- "OUTER",- "OVER",- "PARSE",- "PARTITION",- "PASSWORD",- "PATH",- "POOL",- "PREPARE",- "PRIMARY",- "PRIVATE",- "PRIVILEGE",- "PROCEDURE",- "PUBLIC",- "RAW",- "REALM",- "REDUCE",- "RENAME",- "RETURN",- "RETURNING",- "REVOKE",- "RIGHT",- "ROLE",- "ROLLBACK",- "SATISFIES",- "SCHEMA",- "SELECT",- "SELF",- "SEMI",- "SET",- "SHOW",- "SOME",- "START",- "STATISTICS",- "STRING",- "SYSTEM",- "THEN",- "TO",- "TRANSACTION",- "TRIGGER",- "TRUE",- "TRUNCATE",- "UNDER",- "UNION",- "UNIQUE",- "UNKNOWN",- "UNNEST",- "UNSET",- "UPDATE",- "UPSERT",- "USE",- "USER",- "USING",- "VALIDATE",- "VALUE",- "VALUED",- "VALUES",- "VIA",- "VIEW",- "WHEN",- "WHERE",- "WHILE",- "WITH",- "WITHIN",- "WORK",- "XOR",- };-- private static readonly string[] ReservedTopLevelWords- =- {- "DELETE FROM",- "EXCEPT ALL",- "EXCEPT",- "EXPLAIN DELETE FROM",- "EXPLAIN UPDATE",- "EXPLAIN UPSERT",- "FROM",- "GROUP BY",- "HAVING",- "INFER",- "INSERT INTO",- "LET",- "LIMIT",- "MERGE",- "NEST",- "ORDER BY",- "PREPARE",- "SELECT",- "SET CURRENT SCHEMA",- "SET SCHEMA",- "SET",- "UNNEST",- "UPDATE",- "UPSERT",- "USE KEYS",- "VALUES",- "WHERE",- };-- private static readonly string[] ReservedTopLevelWordsNoIndent = new[] { "INTERSECT", "INTERSECT ALL", "MINUS", "UNION", "UNION ALL" };-- private static readonly string[] ReservedNewlineWords- =- {- "AND",- "OR",- "XOR",- // joins- "JOIN",- "INNER JOIN",- "LEFT JOIN",- "LEFT OUTER JOIN",- "RIGHT JOIN",- "RIGHT OUTER JOIN",- };-- protected override Tokenizer GetTokenizer()- {- return- new Tokenizer(- ReservedWords,- ReservedTopLevelWords,- ReservedNewlineWords,- ReservedTopLevelWordsNoIndent,- stringTypes: new[] { "\"\"", "''", "``" },- openParens: new[] { "(", "[", "{" },- closeParens: new[] { ")", "]", "}" },- indexedPlaceholderTypes: Array.Empty<char>(),- namedPlaceholderTypes: new[] { '$' },- lineCommentTypes: new[] { "#", "--" },- specialWordChars: Array.Empty<string>(),- operators: new[] { "==", "!=" });- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Languages/PlSqlFormatter.cs b/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Languages/PlSqlFormatter.csdeleted file mode 100644index c32e2df25..000000000--- a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Languages/PlSqlFormatter.cs+++ /dev/null@@ -1,454 +0,0 @@-using DevToys.Tools.Helpers.SqlFormatter.Core;--namespace DevToys.Tools.Helpers.SqlFormatter.Languages;--internal sealed class PlSqlFormatter : Formatter-{- private static readonly string[] ReservedWords- =- {- "A",- "ACCESSIBLE",- "AGENT",- "AGGREGATE",- "ALL",- "ALTER",- "ANY",- "ARRAY",- "AS",- "ASC",- "AT",- "ATTRIBUTE",- "AUTHID",- "AVG",- "BETWEEN",- "BFILE_BASE",- "BINARY_INTEGER",- "BINARY",- "BLOB_BASE",- "BLOCK",- "BODY",- "BOOLEAN",- "BOTH",- "BOUND",- "BREADTH",- "BULK",- "BY",- "BYTE",- "C",- "CALL",- "CALLING",- "CASCADE",- "CASE",- "CHAR_BASE",- "CHAR",- "CHARACTER",- "CHARSET",- "CHARSETFORM",- "CHARSETID",- "CHECK",- "CLOB_BASE",- "CLONE",- "CLOSE",- "CLUSTER",- "CLUSTERS",- "COALESCE",- "COLAUTH",- "COLLECT",- "COLUMNS",- "COMMENT",- "COMMIT",- "COMMITTED",- "COMPILED",- "COMPRESS",- "CONNECT",- "CONSTANT",- "CONSTRUCTOR",- "CONTEXT",- "CONTINUE",- "CONVERT",- "COUNT",- "CRASH",- "CREATE",- "CREDENTIAL",- "CURRENT",- "CURRVAL",- "CURSOR",- "CUSTOMDATUM",- "DANGLING",- "DATA",- "DATE_BASE",- "DATE",- "DAY",- "DECIMAL",- "DEFAULT",- "DEFINE",- "DELETE",- "DEPTH",- "DESC",- "DETERMINISTIC",- "DIRECTORY",- "DISTINCT",- "DO",- "DOUBLE",- "DROP",- "DURATION",- "ELEMENT",- "ELSIF",- "EMPTY",- "END",- "ESCAPE",- "EXCEPTIONS",- "EXCLUSIVE",- "EXECUTE",- "EXISTS",- "EXIT",- "EXTENDS",- "EXTERNAL",- "EXTRACT",- "FALSE",- "FETCH",- "FINAL",- "FIRST",- "FIXED",- "FLOAT",- "FOR",- "FORALL",- "FORCE",- "FROM",- "FUNCTION",- "GENERAL",- "GOTO",- "GRANT",- "GROUP",- "HASH",- "HEAP",- "HIDDEN",- "HOUR",- "IDENTIFIED",- "IF",- "IMMEDIATE",- "IN",- "INCLUDING",- "INDEX",- "INDEXES",- "INDICATOR",- "INDICES",- "INFINITE",- "INSTANTIABLE",- "INT",- "INTEGER",- "INTERFACE",- "INTERVAL",- "INTO",- "INVALIDATE",- "IS",- "ISOLATION",- "JAVA",- "LANGUAGE",- "LARGE",- "LEADING",- "LENGTH",- "LEVEL",- "LIBRARY",- "LIKE",- "LIKE2",- "LIKE4",- "LIKEC",- "LIMITED",- "LOCAL",- "LOCK",- "LONG",- "MAP",- "MAX",- "MAXLEN",- "MEMBER",- "MERGE",- "MIN",- "MINUTE",- "MLSLABEL",- "MOD",- "MODE",- "MONTH",- "MULTISET",- "NAME",- "NAN",- "NATIONAL",- "NATIVE",- "NATURAL",- "NATURALN",- "NCHAR",- "NEW",- "NEXTVAL",- "NOCOMPRESS",- "NOCOPY",- "NOT",- "NOWAIT",- "NULL",- "NULLIF",- "NUMBER_BASE",- "NUMBER",- "OBJECT",- "OCICOLL",- "OCIDATE",- "OCIDATETIME",- "OCIDURATION",- "OCIINTERVAL",- "OCILOBLOCATOR",- "OCINUMBER",- "OCIRAW",- "OCIREF",- "OCIREFCURSOR",- "OCIROWID",- "OCISTRING",- "OCITYPE",- "OF",- "OLD",- "ON",- "ONLY",- "OPAQUE",- "OPEN",- "OPERATOR",- "OPTION",- "ORACLE",- "ORADATA",- "ORDER",- "ORGANIZATION",- "ORLANY",- "ORLVARY",- "OTHERS",- "OUT",- "OVERLAPS",- "OVERRIDING",- "PACKAGE",- "PARALLEL_ENABLE",- "PARAMETER",- "PARAMETERS",- "PARENT",- "PARTITION",- "PASCAL",- "PCTFREE",- "PIPE",- "PIPELINED",- "PLS_INTEGER",- "PLUGGABLE",- "POSITIVE",- "POSITIVEN",- "PRAGMA",- "PRECISION",- "PRIOR",- "PRIVATE",- "PROCEDURE",- "PUBLIC",- "RAISE",- "RANGE",- "RAW",- "READ",- "REAL",- "RECORD",- "REF",- "REFERENCE",- "RELEASE",- "RELIES_ON",- "REM",- "REMAINDER",- "RENAME",- "RESOURCE",- "RESULT_CACHE",- "RESULT",- "RETURN",- "RETURNING",- "REVERSE",- "REVOKE",- "ROLLBACK",- "ROW",- "ROWID",- "ROWNUM",- "ROWTYPE",- "SAMPLE",- "SAVE",- "SAVEPOINT",- "SB1",- "SB2",- "SB4",- "SEARCH",- "SECOND",- "SEGMENT",- "SELF",- "SEPARATE",- "SEQUENCE",- "SERIALIZABLE",- "SHARE",- "SHORT",- "SIZE_T",- "SIZE",- "SMALLINT",- "SOME",- "SPACE",- "SPARSE",- "SQL",- "SQLCODE",- "SQLDATA",- "SQLERRM",- "SQLNAME",- "SQLSTATE",- "STANDARD",- "START",- "STATIC",- "STDDEV",- "STORED",- "STRING",- "STRUCT",- "STYLE",- "SUBMULTISET",- "SUBPARTITION",- "SUBSTITUTABLE",- "SUBTYPE",- "SUCCESSFUL",- "SUM",- "SYNONYM",- "SYSDATE",- "TABAUTH",- "TABLE",- "TDO",- "THE",- "THEN",- "TIME",- "TIMESTAMP",- "TIMEZONE_ABBR",- "TIMEZONE_HOUR",- "TIMEZONE_MINUTE",- "TIMEZONE_REGION",- "TO",- "TRAILING",- "TRANSACTION",- "TRANSACTIONAL",- "TRIGGER",- "TRUE",- "TRUSTED",- "TYPE",- "UB1",- "UB2",- "UB4",- "UID",- "UNDER",- "UNIQUE",- "UNPLUG",- "UNSIGNED",- "UNTRUSTED",- "USE",- "USER",- "USING",- "VALIDATE",- "VALIST",- "VALUE",- "VARCHAR",- "VARCHAR2",- "VARIABLE",- "VARIANCE",- "VARRAY",- "VARYING",- "VIEW",- "VIEWS",- "VOID",- "WHENEVER",- "WHILE",- "WITH",- "WORK",- "WRAPPED",- "WRITE",- "YEAR",- "ZONE",- };-- private static readonly string[] ReservedTopLevelWords- =- {- "ADD",- "ALTER COLUMN",- "ALTER TABLE",- "BEGIN",- "CONNECT BY",- "DECLARE",- "DELETE FROM",- "DELETE",- "END",- "EXCEPT",- "EXCEPTION",- "FETCH FIRST",- "FROM",- "GROUP BY",- "HAVING",- "INSERT INTO",- "INSERT",- "LIMIT",- "LOOP",- "MODIFY",- "ORDER BY",- "SELECT",- "SET CURRENT SCHEMA",- "SET SCHEMA",- "SET",- "START WITH",- "UPDATE",- "VALUES",- "WHERE",- };-- private static readonly string[] ReservedTopLevelWordsNoIndent = new[] { "INTERSECT", "INTERSECT ALL", "MINUS", "UNION", "UNION ALL" };-- private static readonly string[] ReservedNewlineWords- =- {- "AND",- "CROSS APPLY",- "ELSE",- "END",- "OR",- "OUTER APPLY",- "WHEN",- "XOR",- // joins- "JOIN",- "INNER JOIN",- "LEFT JOIN",- "LEFT OUTER JOIN",- "RIGHT JOIN",- "RIGHT OUTER JOIN",- "FULL JOIN",- "FULL OUTER JOIN",- "CROSS JOIN",- "NATURAL JOIN",- };-- protected override Tokenizer GetTokenizer()- {- return- new Tokenizer(- ReservedWords,- ReservedTopLevelWords,- ReservedNewlineWords,- ReservedTopLevelWordsNoIndent,- stringTypes: new[] { "\"\"", "N''", "''", "``" },- openParens: new[] { "(", "CASE" },- closeParens: new[] { ")", "END" },- indexedPlaceholderTypes: new[] { '?' },- namedPlaceholderTypes: new[] { ':' },- lineCommentTypes: new[] { "--" },- specialWordChars: new[] { "_", "$", "#", ".", "@" },- operators: new[] { "||", "**", "!=", ":=" });- }-- protected override Token TokenOverride(Token token, ReadOnlySpan<char> querySpan)- {-- if (token.IsSet(querySpan.Slice(token))- && _previousReservedToken != null- && _previousReservedToken.Value.IsBy(querySpan.Slice(_previousReservedToken.Value)))- {- return new Token(token.Index, token.Length, TokenType.Reserved, token.PrecedingWitespaceLength);- }-- return base.TokenOverride(token, querySpan);- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Languages/PostgreSqlFormatter.cs b/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Languages/PostgreSqlFormatter.csdeleted file mode 100644index 8e8e03b8e..000000000--- a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Languages/PostgreSqlFormatter.cs+++ /dev/null@@ -1,547 +0,0 @@-using DevToys.Tools.Helpers.SqlFormatter.Core;--namespace DevToys.Tools.Helpers.SqlFormatter.Languages;--internal sealed class PostgreSqlFormatter : Formatter-{- private static readonly string[] ReservedWords- =- {- "ABORT",- "ABSOLUTE",- "ACCESS",- "ACTION",- "ADD",- "ADMIN",- "AFTER",- "AGGREGATE",- "ALL",- "ALSO",- "ALTER",- "ALWAYS",- "ANALYSE",- "ANALYZE",- "AND",- "ANY",- "ARRAY",- "AS",- "ASC",- "ASSERTION",- "ASSIGNMENT",- "ASYMMETRIC",- "AT",- "ATTACH",- "ATTRIBUTE",- "AUTHORIZATION",- "BACKWARD",- "BEFORE",- "BEGIN",- "BETWEEN",- "BIGINT",- "BINARY",- "BIT",- "BOOLEAN",- "BOTH",- "BY",- "CACHE",- "CALL",- "CALLED",- "CASCADE",- "CASCADED",- "CASE",- "CAST",- "CATALOG",- "CHAIN",- "CHAR",- "CHARACTER",- "CHARACTERISTICS",- "CHECK",- "CHECKPOINT",- "CLASS",- "CLOSE",- "CLUSTER",- "COALESCE",- "COLLATE",- "COLLATION",- "COLUMN",- "COLUMNS",- "COMMENT",- "COMMENTS",- "COMMIT",- "COMMITTED",- "CONCURRENTLY",- "CONFIGURATION",- "CONFLICT",- "CONNECTION",- "CONSTRAINT",- "CONSTRAINTS",- "CONTENT",- "CONTINUE",- "CONVERSION",- "COPY",- "COST",- "CREATE",- "CROSS",- "CSV",- "CUBE",- "CURRENT",- "CURRENT_CATALOG",- "CURRENT_DATE",- "CURRENT_ROLE",- "CURRENT_SCHEMA",- "CURRENT_TIME",- "CURRENT_TIMESTAMP",- "CURRENT_USER",- "CURSOR",- "CYCLE",- "DATA",- "DATABASE",- "DAY",- "DEALLOCATE",- "DEC",- "DECIMAL",- "DECLARE",- "DEFAULT",- "DEFAULTS",- "DEFERRABLE",- "DEFERRED",- "DEFINER",- "DELETE",- "DELIMITER",- "DELIMITERS",- "DEPENDS",- "DESC",- "DETACH",- "DICTIONARY",- "DISABLE",- "DISCARD",- "DISTINCT",- "DO",- "DOCUMENT",- "DOMAIN",- "DOUBLE",- "DROP",- "EACH",- "ELSE",- "ENABLE",- "ENCODING",- "ENCRYPTED",- "END",- "ENUM",- "ESCAPE",- "EVENT",- "EXCEPT",- "EXCLUDE",- "EXCLUDING",- "EXCLUSIVE",- "EXECUTE",- "EXISTS",- "EXPLAIN",- "EXPRESSION",- "EXTENSION",- "EXTERNAL",- "EXTRACT",- "FALSE",- "FAMILY",- "FETCH",- "FILTER",- "FIRST",- "FLOAT",- "FOLLOWING",- "FOR",- "FORCE",- "FOREIGN",- "FORWARD",- "FREEZE",- "FROM",- "FULL",- "FUNCTION",- "FUNCTIONS",- "GENERATED",- "GLOBAL",- "GRANT",- "GRANTED",- "GREATEST",- "GROUP",- "GROUPING",- "GROUPS",- "HANDLER",- "HAVING",- "HEADER",- "HOLD",- "HOUR",- "IDENTITY",- "IF",- "ILIKE",- "IMMEDIATE",- "IMMUTABLE",- "IMPLICIT",- "IMPORT",- "IN",- "INCLUDE",- "INCLUDING",- "INCREMENT",- "INDEX",- "INDEXES",- "INHERIT",- "INHERITS",- "INITIALLY",- "INLINE",- "INNER",- "INOUT",- "INPUT",- "INSENSITIVE",- "INSERT",- "INSTEAD",- "INT",- "INTEGER",- "INTERSECT",- "INTERVAL",- "INTO",- "INVOKER",- "IS",- "ISNULL",- "ISOLATION",- "JOIN",- "KEY",- "LABEL",- "LANGUAGE",- "LARGE",- "LAST",- "LATERAL",- "LEADING",- "LEAKPROOF",- "LEAST",- "LEFT",- "LEVEL",- "LIKE",- "LIMIT",- "LISTEN",- "LOAD",- "LOCAL",- "LOCALTIME",- "LOCALTIMESTAMP",- "LOCATION",- "LOCK",- "LOCKED",- "LOGGED",- "MAPPING",- "MATCH",- "MATERIALIZED",- "MAXVALUE",- "METHOD",- "MINUTE",- "MINVALUE",- "MODE",- "MONTH",- "MOVE",- "NAME",- "NAMES",- "NATIONAL",- "NATURAL",- "NCHAR",- "NEW",- "NEXT",- "NFC",- "NFD",- "NFKC",- "NFKD",- "NO",- "NONE",- "NORMALIZE",- "NORMALIZED",- "NOT",- "NOTHING",- "NOTIFY",- "NOTNULL",- "NOWAIT",- "NULL",- "NULLIF",- "NULLS",- "NUMERIC",- "OBJECT",- "OF",- "OFF",- "OFFSET",- "OIDS",- "OLD",- "ON",- "ONLY",- "OPERATOR",- "OPTION",- "OPTIONS",- "OR",- "ORDER",- "ORDINALITY",- "OTHERS",- "OUT",- "OUTER",- "OVER",- "OVERLAPS",- "OVERLAY",- "OVERRIDING",- "OWNED",- "OWNER",- "PARALLEL",- "PARSER",- "PARTIAL",- "PARTITION",- "PASSING",- "PASSWORD",- "PLACING",- "PLANS",- "POLICY",- "POSITION",- "PRECEDING",- "PRECISION",- "PREPARE",- "PREPARED",- "PRESERVE",- "PRIMARY",- "PRIOR",- "PRIVILEGES",- "PROCEDURAL",- "PROCEDURE",- "PROCEDURES",- "PROGRAM",- "PUBLICATION",- "QUOTE",- "RANGE",- "READ",- "REAL",- "REASSIGN",- "RECHECK",- "RECURSIVE",- "REF",- "REFERENCES",- "REFERENCING",- "REFRESH",- "REINDEX",- "RELATIVE",- "RELEASE",- "RENAME",- "REPEATABLE",- "REPLACE",- "REPLICA",- "RESET",- "RESTART",- "RESTRICT",- "RETURNING",- "RETURNS",- "REVOKE",- "RIGHT",- "ROLE",- "ROLLBACK",- "ROLLUP",- "ROUTINE",- "ROUTINES",- "ROW",- "ROWS",- "RULE",- "SAVEPOINT",- "SCHEMA",- "SCHEMAS",- "SCROLL",- "SEARCH",- "SECOND",- "SECURITY",- "SELECT",- "SEQUENCE",- "SEQUENCES",- "SERIALIZABLE",- "SERVER",- "SESSION",- "SESSION_USER",- "SET",- "SETOF",- "SETS",- "SHARE",- "SHOW",- "SIMILAR",- "SIMPLE",- "SKIP",- "SMALLINT",- "SNAPSHOT",- "SOME",- "SQL",- "STABLE",- "STANDALONE",- "START",- "STATEMENT",- "STATISTICS",- "STDIN",- "STDOUT",- "STORAGE",- "STORED",- "STRICT",- "STRIP",- "SUBSCRIPTION",- "SUBSTRING",- "SUPPORT",- "SYMMETRIC",- "SYSID",- "SYSTEM",- "TABLE",- "TABLES",- "TABLESAMPLE",- "TABLESPACE",- "TEMP",- "TEMPLATE",- "TEMPORARY",- "TEXT",- "THEN",- "TIES",- "TIME",- "TIMESTAMP",- "TO",- "TRAILING",- "TRANSACTION",- "TRANSFORM",- "TREAT",- "TRIGGER",- "TRIM",- "TRUE",- "TRUNCATE",- "TRUSTED",- "TYPE",- "TYPES",- "UESCAPE",- "UNBOUNDED",- "UNCOMMITTED",- "UNENCRYPTED",- "UNION",- "UNIQUE",- "UNKNOWN",- "UNLISTEN",- "UNLOGGED",- "UNTIL",- "UPDATE",- "USER",- "USING",- "VACUUM",- "VALID",- "VALIDATE",- "VALIDATOR",- "VALUE",- "VALUES",- "VARCHAR",- "VARIADIC",- "VARYING",- "VERBOSE",- "VERSION",- "VIEW",- "VIEWS",- "VOLATILE",- "WHEN",- "WHERE",- "WHITESPACE",- "WINDOW",- "WITH",- "WITHIN",- "WITHOUT",- "WORK",- "WRAPPER",- "WRITE",- "XML",- "XMLATTRIBUTES",- "XMLCONCAT",- "XMLELEMENT",- "XMLEXISTS",- "XMLFOREST",- "XMLNAMESPACES",- "XMLPARSE",- "XMLPI",- "XMLROOT",- "XMLSERIALIZE",- "XMLTABLE",- "YEAR",- "YES",- "ZONE",- };-- private static readonly string[] ReservedTopLevelWords- =- {- "ADD",- "AFTER",- "ALTER COLUMN",- "ALTER TABLE",- "CASE",- "DELETE FROM",- "END",- "EXCEPT",- "FETCH FIRST",- "FROM",- "GROUP BY",- "HAVING",- "INSERT INTO",- "INSERT",- "LIMIT",- "ORDER BY",- "SELECT",- "SET CURRENT SCHEMA",- "SET SCHEMA",- "SET",- "UPDATE",- "VALUES",- "WHERE",- };-- private static readonly string[] ReservedTopLevelWordsNoIndent = new[] { "INTERSECT", "INTERSECT ALL", "UNION", "UNION ALL" };-- private static readonly string[] ReservedNewlineWords- =- {- "AND",- "ELSE",- "OR",- "WHEN",- // joins- "JOIN",- "INNER JOIN",- "LEFT JOIN",- "LEFT OUTER JOIN",- "RIGHT JOIN",- "RIGHT OUTER JOIN",- "FULL JOIN",- "FULL OUTER JOIN",- "CROSS JOIN",- "NATURAL JOIN",- };-- protected override Tokenizer GetTokenizer()- {- return- new Tokenizer(- ReservedWords,- ReservedTopLevelWords,- ReservedNewlineWords,- ReservedTopLevelWordsNoIndent,- stringTypes: new[] { "\"\"", "''", "U&''", "U&\"\"", "$$" },- openParens: new[] { "(", "CASE" },- closeParens: new[] { ")", "END" },- indexedPlaceholderTypes: new[] { '$' },- namedPlaceholderTypes: new[] { ':', '@' },- lineCommentTypes: new[] { "--" },- specialWordChars: new[] { "@", "$" },- operators: new[]- {- "!=",- "<<",- ">>",- "||/",- "|/",- "::",- "->>",- "->",- "~~*",- "~~",- "!~~*",- "!~~",- "~*",- "!~*",- "!~",- "!!"- });- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Languages/RedshiftFormatter.cs b/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Languages/RedshiftFormatter.csdeleted file mode 100644index a13647447..000000000--- a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Languages/RedshiftFormatter.cs+++ /dev/null@@ -1,402 +0,0 @@-using DevToys.Tools.Helpers.SqlFormatter.Core;--namespace DevToys.Tools.Helpers.SqlFormatter.Languages;--internal sealed class RedshiftFormatter : Formatter-{- private static readonly string[] ReservedWords- =- {- "AES128",- "AES256",- "ALLOWOVERWRITE",- "ANALYSE",- "ARRAY",- "AS",- "ASC",- "AUTHORIZATION",- "BACKUP",- "BINARY",- "BLANKSASNULL",- "BOTH",- "BYTEDICT",- "BZIP2",- "CAST",- "CHECK",- "COLLATE",- "COLUMN",- "CONSTRAINT",- "CREATE",- "CREDENTIALS",- "CURRENT_DATE",- "CURRENT_TIME",- "CURRENT_TIMESTAMP",- "CURRENT_USER",- "CURRENT_USER_ID",- "DEFAULT",- "DEFERRABLE",- "DEFLATE",- "DEFRAG",- "DELTA",- "DELTA32K",- "DESC",- "DISABLE",- "DISTINCT",- "DO",- "ELSE",- "EMPTYASNULL",- "ENABLE",- "ENCODE",- "ENCRYPT",- "ENCRYPTION",- "END",- "EXPLICIT",- "FALSE",- "FOR",- "FOREIGN",- "FREEZE",- "FULL",- "GLOBALDICT256",- "GLOBALDICT64K",- "GRANT",- "GZIP",- "IDENTITY",- "IGNORE",- "ILIKE",- "INITIALLY",- "INTO",- "LEADING",- "LOCALTIME",- "LOCALTIMESTAMP",- "LUN",- "LUNS",- "LZO",- "LZOP",- "MINUS",- "MOSTLY13",- "MOSTLY32",- "MOSTLY8",- "NATURAL",- "NEW",- "NULLS",- "OFF",- "OFFLINE",- "OFFSET",- "OLD",- "ON",- "ONLY",- "OPEN",- "ORDER",- "OVERLAPS",- "PARALLEL",- "PARTITION",- "PERCENT",- "PERMISSIONS",- "PLACING",- "PRIMARY",- "RAW",- "READRATIO",- "RECOVER",- "REFERENCES",- "REJECTLOG",- "RESORT",- "RESTORE",- "SESSION_USER",- "SIMILAR",- "SYSDATE",- "SYSTEM",- "TABLE",- "TAG",- "TDES",- "TEXT255",- "TEXT32K",- "THEN",- "TIMESTAMP",- "TO",- "TOP",- "TRAILING",- "TRUE",- "TRUNCATECOLUMNS",- "UNIQUE",- "USER",- "USING",- "VERBOSE",- "WALLET",- "WHEN",- "WITH",- "WITHOUT",- "PREDICATE",- "COLUMNS",- "COMPROWS",- "COMPRESSION",- "COPY",- "FORMAT",- "DELIMITER",- "FIXEDWIDTH",- "AVRO",- "JSON",- "ENCRYPTED",- "BZIP2",- "GZIP",- "LZOP",- "PARQUET",- "ORC",- "ACCEPTANYDATE",- "ACCEPTINVCHARS",- "BLANKSASNULL",- "DATEFORMAT",- "EMPTYASNULL",- "ENCODING",- "ESCAPE",- "EXPLICIT_IDS",- "FILLRECORD",- "IGNOREBLANKLINES",- "IGNOREHEADER",- "NULL AS",- "REMOVEQUOTES",- "ROUNDEC",- "TIMEFORMAT",- "TRIMBLANKS",- "TRUNCATECOLUMNS",- "COMPROWS",- "COMPUPDATE",- "MAXERROR",- "NOLOAD",- "STATUPDATE",- "MANIFEST",- "REGION",- "IAM_ROLE",- "MASTER_SYMMETRIC_KEY",- "SSH",- "ACCEPTANYDATE",- "ACCEPTINVCHARS",- "ACCESS_KEY_ID",- "SECRET_ACCESS_KEY",- "AVRO",- "BLANKSASNULL",- "BZIP2",- "COMPROWS",- "COMPUPDATE",- "CREDENTIALS",- "DATEFORMAT",- "DELIMITER",- "EMPTYASNULL",- "ENCODING",- "ENCRYPTED",- "ESCAPE",- "EXPLICIT_IDS",- "FILLRECORD",- "FIXEDWIDTH",- "FORMAT",- "IAM_ROLE",- "GZIP",- "IGNOREBLANKLINES",- "IGNOREHEADER",- "JSON",- "LZOP",- "MANIFEST",- "MASTER_SYMMETRIC_KEY",- "MAXERROR",- "NOLOAD",- "NULL AS",- "READRATIO",- "REGION",- "REMOVEQUOTES",- "ROUNDEC",- "SSH",- "STATUPDATE",- "TIMEFORMAT",- "SESSION_TOKEN",- "TRIMBLANKS",- "TRUNCATECOLUMNS",- "EXTERNAL",- "DATA CATALOG",- "HIVE METASTORE",- "CATALOG_ROLE",- "VACUUM",- "COPY",- "UNLOAD",- "EVEN",- "ALL",- };-- private static readonly string[] ReservedTopLevelWords- =- {- "ADD",- "AFTER",- "ALTER COLUMN",- "ALTER TABLE",- "DELETE FROM",- "EXCEPT",- "FROM",- "GROUP BY",- "HAVING",- "INSERT INTO",- "INSERT",- "INTERSECT",- "TOP",- "LIMIT",- "MODIFY",- "ORDER BY",- "SELECT",- "SET CURRENT SCHEMA",- "SET SCHEMA",- "SET",- "UNION ALL",- "UNION",- "UPDATE",- "VALUES",- "WHERE",- "VACUUM",- "COPY",- "UNLOAD",- "ANALYZE",- "ANALYSE",- "DISTKEY",- "SORTKEY",- "COMPOUND",- "INTERLEAVED",- "FORMAT",- "DELIMITER",- "FIXEDWIDTH",- "AVRO",- "JSON",- "ENCRYPTED",- "BZIP2",- "GZIP",- "LZOP",- "PARQUET",- "ORC",- "ACCEPTANYDATE",- "ACCEPTINVCHARS",- "BLANKSASNULL",- "DATEFORMAT",- "EMPTYASNULL",- "ENCODING",- "ESCAPE",- "EXPLICIT_IDS",- "FILLRECORD",- "IGNOREBLANKLINES",- "IGNOREHEADER",- "NULL AS",- "REMOVEQUOTES",- "ROUNDEC",- "TIMEFORMAT",- "TRIMBLANKS",- "TRUNCATECOLUMNS",- "COMPROWS",- "COMPUPDATE",- "MAXERROR",- "NOLOAD",- "STATUPDATE",- "MANIFEST",- "REGION",- "IAM_ROLE",- "MASTER_SYMMETRIC_KEY",- "SSH",- "ACCEPTANYDATE",- "ACCEPTINVCHARS",- "ACCESS_KEY_ID",- "SECRET_ACCESS_KEY",- "AVRO",- "BLANKSASNULL",- "BZIP2",- "COMPROWS",- "COMPUPDATE",- "CREDENTIALS",- "DATEFORMAT",- "DELIMITER",- "EMPTYASNULL",- "ENCODING",- "ENCRYPTED",- "ESCAPE",- "EXPLICIT_IDS",- "FILLRECORD",- "FIXEDWIDTH",- "FORMAT",- "IAM_ROLE",- "GZIP",- "IGNOREBLANKLINES",- "IGNOREHEADER",- "JSON",- "LZOP",- "MANIFEST",- "MASTER_SYMMETRIC_KEY",- "MAXERROR",- "NOLOAD",- "NULL AS",- "READRATIO",- "REGION",- "REMOVEQUOTES",- "ROUNDEC",- "SSH",- "STATUPDATE",- "TIMEFORMAT",- "SESSION_TOKEN",- "TRIMBLANKS",- "TRUNCATECOLUMNS",- "EXTERNAL",- "DATA CATALOG",- "HIVE METASTORE",- "CATALOG_ROLE",- };-- private static readonly string[] ReservedTopLevelWordsNoIndent = Array.Empty<string>();-- private static readonly string[] ReservedNewlineWords- =- {- "AND",- "ELSE",- "OR",- "OUTER APPLY",- "WHEN",- "VACUUM",- "COPY",- "UNLOAD",- "ANALYZE",- "ANALYSE",- "DISTKEY",- "SORTKEY",- "COMPOUND",- "INTERLEAVED",- // joins- "JOIN",- "INNER JOIN",- "LEFT JOIN",- "LEFT OUTER JOIN",- "RIGHT JOIN",- "RIGHT OUTER JOIN",- "FULL JOIN",- "FULL OUTER JOIN",- "CROSS JOIN",- "NATURAL JOIN",- };-- protected override Tokenizer GetTokenizer()- {- return- new Tokenizer(- ReservedWords,- ReservedTopLevelWords,- ReservedNewlineWords,- ReservedTopLevelWordsNoIndent,- stringTypes: new[] { "\"\"", "''", "``" },- openParens: new[] { "(" },- closeParens: new[] { ")" },- indexedPlaceholderTypes: new[] { '?' },- namedPlaceholderTypes: new[] { '@', '#', '$' },- lineCommentTypes: new[] { "--" },- specialWordChars: Array.Empty<string>(),- operators: new[]- {- "|/",- "||/",- "<<",- ">>",- "!=",- "||"- });- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Languages/SparkSqlFormatter.cs b/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Languages/SparkSqlFormatter.csdeleted file mode 100644index fe6348af1..000000000--- a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Languages/SparkSqlFormatter.cs+++ /dev/null@@ -1,296 +0,0 @@-using DevToys.Tools.Helpers.SqlFormatter.Core;--namespace DevToys.Tools.Helpers.SqlFormatter.Languages;--internal sealed class SparkSqlFormatter : Formatter-{- private static readonly string[] ReservedWords- =- {- "ALL",- "ALTER",- "ANALYSE",- "ANALYZE",- "ARRAY_ZIP",- "ARRAY",- "AS",- "ASC",- "AVG",- "BETWEEN",- "CASCADE",- "CASE",- "CAST",- "COALESCE",- "COLLECT_LIST",- "COLLECT_SET",- "COLUMN",- "COLUMNS",- "COMMENT",- "CONSTRAINT",- "CONTAINS",- "CONVERT",- "COUNT",- "CUME_DIST",- "CURRENT ROW",- "CURRENT_DATE",- "CURRENT_TIMESTAMP",- "DATABASE",- "DATABASES",- "DATE_ADD",- "DATE_SUB",- "DATE_TRUNC",- "DAY_HOUR",- "DAY_MINUTE",- "DAY_SECOND",- "DAY",- "DAYS",- "DECODE",- "DEFAULT",- "DELETE",- "DENSE_RANK",- "DESC",- "DESCRIBE",- "DISTINCT",- "DISTINCTROW",- "DIV",- "DROP",- "ELSE",- "ENCODE",- "END",- "EXISTS",- "EXPLAIN",- "EXPLODE_OUTER",- "EXPLODE",- "FILTER",- "FIRST_VALUE",- "FIRST",- "FIXED",- "FLATTEN",- "FOLLOWING",- "FROM_UNIXTIME",- "FULL",- "GREATEST",- "GROUP_CONCAT",- "HOUR_MINUTE",- "HOUR_SECOND",- "HOUR",- "HOURS",- "IF",- "IFNULL",- "IN",- "INSERT",- "INTERVAL",- "INTO",- "IS",- "LAG",- "LAST_VALUE",- "LAST",- "LEAD",- "LEADING",- "LEAST",- "LEVEL",- "LIKE",- "MAX",- "MERGE",- "MIN",- "MINUTE_SECOND",- "MINUTE",- "MONTH",- "NATURAL",- "NOT",- "NOW()",- "NTILE",- "NULL",- "NULLIF",- "OFFSET",- "ON DELETE",- "ON UPDATE",- "ON",- "ONLY",- "OPTIMIZE",- "OVER",- "PERCENT_RANK",- "PRECEDING",- "RANGE",- "RANK",- "REGEXP",- "RENAME",- "RLIKE",- "ROW",- "ROWS",- "SECOND",- "SEPARATOR",- "SEQUENCE",- "SIZE",- "STRING",- "STRUCT",- "SUM",- "TABLE",- "TABLES",- "TEMPORARY",- "THEN",- "TO_DATE",- "TO_JSON",- "TO",- "TRAILING",- "TRANSFORM",- "TRUE",- "TRUNCATE",- "TYPE",- "TYPES",- "UNBOUNDED",- "UNIQUE",- "UNIX_TIMESTAMP",- "UNLOCK",- "UNSIGNED",- "USING",- "VARIABLES",- "VIEW",- "WHEN",- "WITH",- "YEAR_MONTH",- };-- private static readonly string[] ReservedTopLevelWords- =- {- "ADD",- "AFTER",- "ALTER COLUMN",- "ALTER DATABASE",- "ALTER SCHEMA",- "ALTER TABLE",- "CLUSTER BY",- "CLUSTERED BY",- "DELETE FROM",- "DISTRIBUTE BY",- "FROM",- "GROUP BY",- "HAVING",- "INSERT INTO",- "INSERT",- "LIMIT",- "OPTIONS",- "ORDER BY",- "PARTITION BY",- "PARTITIONED BY",- "RANGE",- "ROWS",- "SELECT",- "SET CURRENT SCHEMA",- "SET SCHEMA",- "SET",- "TBLPROPERTIES",- "UPDATE",- "USING",- "VALUES",- "WHERE",- "WINDOW",- };-- private static readonly string[] ReservedTopLevelWordsNoIndent- =- {- "EXCEPT ALL",- "EXCEPT",- "INTERSECT ALL",- "INTERSECT",- "UNION ALL",- "UNION"- };-- private static readonly string[] ReservedNewlineWords- =- {- "AND",- "CREATE OR",- "CREATE",- "ELSE",- "LATERAL VIEW",- "OR",- "OUTER APPLY",- "WHEN",- "XOR",- // joins- "JOIN",- "INNER JOIN",- "LEFT JOIN",- "LEFT OUTER JOIN",- "RIGHT JOIN",- "RIGHT OUTER JOIN",- "FULL JOIN",- "FULL OUTER JOIN",- "CROSS JOIN",- "NATURAL JOIN",- // non-standard-joins- "ANTI JOIN",- "SEMI JOIN",- "LEFT ANTI JOIN",- "LEFT SEMI JOIN",- "RIGHT OUTER JOIN",- "RIGHT SEMI JOIN",- "NATURAL ANTI JOIN",- "NATURAL FULL OUTER JOIN",- "NATURAL INNER JOIN",- "NATURAL LEFT ANTI JOIN",- "NATURAL LEFT OUTER JOIN",- "NATURAL LEFT SEMI JOIN",- "NATURAL OUTER JOIN",- "NATURAL RIGHT OUTER JOIN",- "NATURAL RIGHT SEMI JOIN",- "NATURAL SEMI JOIN",- };-- protected override Tokenizer GetTokenizer()- {- return- new Tokenizer(- ReservedWords,- ReservedTopLevelWords,- ReservedNewlineWords,- ReservedTopLevelWordsNoIndent,- stringTypes: new[] { "\"\"", "''", "``", "{}" },- openParens: new[] { "(", "CASE" },- closeParens: new[] { ")", "END" },- indexedPlaceholderTypes: new[] { '?' },- namedPlaceholderTypes: new[] { '$' },- lineCommentTypes: new[] { "--" },- specialWordChars: Array.Empty<string>(),- operators: new[]- {- "!=",- "<=>",- "&&",- "||",- "=="- });- }-- protected override Token TokenOverride(Token token, ReadOnlySpan<char> querySpan)- {- // Fix cases where names are ambiguously keywords or functions- if (token.IsWindow(querySpan.Slice(token)))- {- Token? aheadToken = TokenLookAhead();- if (aheadToken is { Type: TokenType.OpenParen })- // This is a function call, treat it as a reserved word- return new Token(token.Index, token.Length, TokenType.Reserved, token.PrecedingWitespaceLength);- }-- // Fix cases where names are ambiguously keywords or properties- if (token.IsEnd(querySpan.Slice(token)))- {- Token? backToken = TokenLookBehind();- if (backToken is not null- && backToken.Value.Type == TokenType.Operator- && backToken.Value.Length == 1- && querySpan[backToken.Value.Index] == '.')- {- // This is window().end (or similar) not CASE ... END- return new Token(token.Index, token.Length, TokenType.Word, token.PrecedingWitespaceLength);- }- }-- return token;- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Languages/StandardSqlFormatter.cs b/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Languages/StandardSqlFormatter.csdeleted file mode 100644index f0e815f01..000000000--- a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Languages/StandardSqlFormatter.cs+++ /dev/null@@ -1,386 +0,0 @@-using DevToys.Tools.Helpers.SqlFormatter.Core;--namespace DevToys.Tools.Helpers.SqlFormatter.Languages;--internal sealed class StandardSqlFormatter : Formatter-{- private static readonly string[] ReservedWords- =- {- "ABS",- "ALL",- "ALLOCATE",- "ALTER",- "AND",- "ANY",- "ARE",- "ARRAY",- "AS",- "ASENSITIVE",- "ASYMMETRIC",- "AT",- "ATOMIC",- "AUTHORIZATION",- "AVG",- "BEGIN",- "BETWEEN",- "BIGINT",- "BINARY",- "BLOB",- "BOOLEAN",- "BOTH",- "BY",- "CALL",- "CALLED",- "CARDINALITY",- "CASCADED",- "CASE",- "CAST",- "CEIL",- "CEILING",- "CHAR",- "CHAR_LENGTH",- "CHARACTER",- "CHARACTER_LENGTH",- "CHECK",- "CLOB",- "CLOSE",- "COALESCE",- "COLLATE",- "COLLECT",- "COLUMN",- "COMMIT",- "CONDITION",- "CONNECT",- "CONSTRAINT",- "CONVERT",- "CORR",- "CORRESPONDING",- "COUNT",- "COVAR_POP",- "COVAR_SAMP",- "CREATE",- "CROSS",- "CUBE",- "CUME_DIST",- "CURRENT",- "CURRENT_CATALOG",- "CURRENT_DATE",- "CURRENT_DEFAULT_TRANSFORM_GROUP",- "CURRENT_PATH",- "CURRENT_ROLE",- "CURRENT_SCHEMA",- "CURRENT_TIME",- "CURRENT_TIMESTAMP",- "CURRENT_TRANSFORM_GROUP_FOR_TYPE",- "CURRENT_USER",- "CURSOR",- "CYCLE",- "DATE",- "DAY",- "DEALLOCATE",- "DEC",- "DECIMAL",- "DECLARE",- "DEFAULT",- "DELETE",- "DENSE_RANK",- "DEREF",- "DESCRIBE",- "DETERMINISTIC",- "DISCONNECT",- "DISTINCT",- "DOUBLE",- "DROP",- "DYNAMIC",- "EACH",- "ELEMENT",- "ELSE",- "END",- "END-EXEC",- "ESCAPE",- "EVERY",- "EXCEPT",- "EXEC",- "EXECUTE",- "EXISTS",- "EXP",- "EXTERNAL",- "EXTRACT",- "FALSE",- "FETCH",- "FILTER",- "FLOAT",- "FLOOR",- "FOR",- "FOREIGN",- "FREE",- "FROM",- "FULL",- "FUNCTION",- "FUSION",- "GET",- "GLOBAL",- "GRANT",- "GROUP",- "GROUPING",- "HAVING",- "HOLD",- "HOUR",- "IDENTITY",- "IN",- "INDICATOR",- "INNER",- "INOUT",- "INSENSITIVE",- "INSERT",- "INT",- "INTEGER",- "INTERSECT",- "INTERSECTION",- "INTERVAL",- "INTO",- "IS",- "JOIN",- "LANGUAGE",- "LARGE",- "LATERAL",- "LEADING",- "LEFT",- "LIKE",- "LIKE_REGEX",- "LN",- "LOCAL",- "LOCALTIME",- "LOCALTIMESTAMP",- "LOWER",- "MATCH",- "MAX",- "MEMBER",- "MERGE",- "METHOD",- "MIN",- "MINUTE",- "MOD",- "MODIFIES",- "MODULE",- "MONTH",- "MULTISET",- "NATIONAL",- "NATURAL",- "NCHAR",- "NCLOB",- "NEW",- "NO",- "NONE",- "NORMALIZE",- "NOT",- "NULL",- "NULLIF",- "NUMERIC",- "OCTET_LENGTH",- "OCCURRENCES_REGEX",- "OF",- "OLD",- "ON",- "ONLY",- "OPEN",- "OR",- "ORDER",- "OUT",- "OUTER",- "OVER",- "OVERLAPS",- "OVERLAY",- "PARAMETER",- "PARTITION",- "PERCENT_RANK",- "PERCENTILE_CONT",- "PERCENTILE_DISC",- "POSITION",- "POSITION_REGEX",- "POWER",- "PRECISION",- "PREPARE",- "PRIMARY",- "PROCEDURE",- "RANGE",- "RANK",- "READS",- "REAL",- "RECURSIVE",- "REF",- "REFERENCES",- "REFERENCING",- "REGR_AVGX",- "REGR_AVGY",- "REGR_COUNT",- "REGR_INTERCEPT",- "REGR_R2",- "REGR_SLOPE",- "REGR_SXX",- "REGR_SXY",- "REGR_SYY",- "RELEASE",- "RESULT",- "RETURN",- "RETURNS",- "REVOKE",- "RIGHT",- "ROLLBACK",- "ROLLUP",- "ROW",- "ROW_NUMBER",- "ROWS",- "SAVEPOINT",- "SCOPE",- "SCROLL",- "SEARCH",- "SECOND",- "SELECT",- "SENSITIVE",- "SESSION_USER",- "SET",- "SIMILAR",- "SMALLINT",- "SOME",- "SPECIFIC",- "SPECIFICTYPE",- "SQL",- "SQLEXCEPTION",- "SQLSTATE",- "SQLWARNING",- "SQRT",- "START",- "STATIC",- "STDDEV_POP",- "STDDEV_SAMP",- "SUBMULTISET",- "SUBSTRING",- "SUBSTRING_REGEX",- "SUM",- "SYMMETRIC",- "SYSTEM",- "SYSTEM_USER",- "TABLE",- "TABLESAMPLE",- "THEN",- "TIME",- "TIMESTAMP",- "TIMEZONE_HOUR",- "TIMEZONE_MINUTE",- "TO",- "TRAILING",- "TRANSLATE",- "TRANSLATE_REGEX",- "TRANSLATION",- "TREAT",- "TRIGGER",- "TRIM",- "TRUE",- "UESCAPE",- "UNION",- "UNIQUE",- "UNKNOWN",- "UNNEST",- "UPDATE",- "UPPER",- "USER",- "USING",- "VALUE",- "VALUES",- "VAR_POP",- "VAR_SAMP",- "VARBINARY",- "VARCHAR",- "VARYING",- "WHEN",- "WHENEVER",- "WHERE",- "WIDTH_BUCKET",- "WINDOW",- "WITH",- "WITHIN",- "WITHOUT",- "YEAR",- };-- private static readonly string[] ReservedTopLevelWords- =- {- "ADD",- "ALTER COLUMN",- "ALTER TABLE",- "CASE",- "DELETE FROM",- "END",- "FETCH FIRST",- "FETCH NEXT",- "FETCH PRIOR",- "FETCH LAST",- "FETCH ABSOLUTE",- "FETCH RELATIVE",- "FROM",- "GROUP BY",- "HAVING",- "INSERT INTO",- "LIMIT",- "ORDER BY",- "SELECT",- "SET SCHEMA",- "SET",- "UPDATE",- "VALUES",- "WHERE",- };-- private static readonly string[] ReservedTopLevelWordsNoIndent- =- {- "INTERSECT",- "INTERSECT ALL",- "INTERSECT DISTINCT",- "UNION",- "UNION ALL",- "UNION DISTINCT",- "EXCEPT",- "EXCEPT ALL",- "EXCEPT DISTINCT",- };-- private static readonly string[] ReservedNewlineWords- =- {- "AND",- "ELSE",- "OR",- "WHEN",- "JOIN",- "INNER JOIN",- "LEFT JOIN",- "LEFT OUTER JOIN",- "RIGHT JOIN",- "RIGHT OUTER JOIN",- "FULL JOIN",- "FULL OUTER JOIN",- "CROSS JOIN",- "NATURAL JOIN",- };-- protected override Tokenizer GetTokenizer()- {- return- new Tokenizer(- ReservedWords,- ReservedTopLevelWords,- ReservedNewlineWords,- ReservedTopLevelWordsNoIndent,- stringTypes: new[] { "\"\"", "N''", "''", "``", "[]" },- openParens: new[] { "(", "CASE" },- closeParens: new[] { ")", "END" },- indexedPlaceholderTypes: new[] { '?' },- namedPlaceholderTypes: new[] { '@' },- lineCommentTypes: new[] { "--" },- specialWordChars: new[] { "#", "@", "$" });- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Languages/TSqlFormatter.cs b/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Languages/TSqlFormatter.csdeleted file mode 100644index 71ebca3ec..000000000--- a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/Languages/TSqlFormatter.cs+++ /dev/null@@ -1,286 +0,0 @@-using DevToys.Tools.Helpers.SqlFormatter.Core;--namespace DevToys.Tools.Helpers.SqlFormatter.Languages;--internal sealed class TSqlFormatter : Formatter-{- private static readonly string[] ReservedWords- =- {- "ADD",- "EXTERNAL",- "PROCEDURE",- "ALL",- "FETCH",- "PUBLIC",- "ALTER",- "FILE",- "RAISERROR",- "AND",- "FILLFACTOR",- "READ",- "ANY",- "FOR",- "READTEXT",- "AS",- "FOREIGN",- "RECONFIGURE",- "ASC",- "FREETEXT",- "REFERENCES",- "AUTHORIZATION",- "FREETEXTTABLE",- "REPLICATION",- "BACKUP",- "FROM",- "RESTORE",- "BEGIN",- "FULL",- "RESTRICT",- "BETWEEN",- "FUNCTION",- "RETURN",- "BREAK",- "GOTO",- "REVERT",- "BROWSE",- "GRANT",- "REVOKE",- "BULK",- "GROUP",- "RIGHT",- "BY",- "HAVING",- "ROLLBACK",- "CASCADE",- "HOLDLOCK",- "ROWCOUNT",- "CASE",- "IDENTITY",- "ROWGUIDCOL",- "CHECK",- "IDENTITY_INSERT",- "RULE",- "CHECKPOINT",- "IDENTITYCOL",- "SAVE",- "CLOSE",- "IF",- "SCHEMA",- "CLUSTERED",- "IN",- "SECURITYAUDIT",- "COALESCE",- "INDEX",- "SELECT",- "COLLATE",- "INNER",- "SEMANTICKEYPHRASETABLE",- "COLUMN",- "INSERT",- "SEMANTICSIMILARITYDETAILSTABLE",- "COMMIT",- "INTERSECT",- "SEMANTICSIMILARITYTABLE",- "COMPUTE",- "INTO",- "SESSION_USER",- "CONSTRAINT",- "IS",- "SET",- "CONTAINS",- "JOIN",- "SETUSER",- "CONTAINSTABLE",- "KEY",- "SHUTDOWN",- "CONTINUE",- "KILL",- "SOME",- "CONVERT",- "LEFT",- "STATISTICS",- "CREATE",- "LIKE",- "SYSTEM_USER",- "CROSS",- "LINENO",- "TABLE",- "CURRENT",- "LOAD",- "TABLESAMPLE",- "CURRENT_DATE",- "MERGE",- "TEXTSIZE",- "CURRENT_TIME",- "NATIONAL",- "THEN",- "CURRENT_TIMESTAMP",- "NOCHECK",- "TO",- "CURRENT_USER",- "NONCLUSTERED",- "TOP",- "CURSOR",- "NOT",- "TRAN",- "DATABASE",- "NULL",- "TRANSACTION",- "DBCC",- "NULLIF",- "TRIGGER",- "DEALLOCATE",- "OF",- "TRUNCATE",- "DECLARE",- "OFF",- "TRY_CONVERT",- "DEFAULT",- "OFFSETS",- "TSEQUAL",- "DELETE",- "ON",- "UNION",- "DENY",- "OPEN",- "UNIQUE",- "DESC",- "OPENDATASOURCE",- "UNPIVOT",- "DISK",- "OPENQUERY",- "UPDATE",- "DISTINCT",- "OPENROWSET",- "UPDATETEXT",- "DISTRIBUTED",- "OPENXML",- "USE",- "DOUBLE",- "OPTION",- "USER",- "DROP",- "OR",- "VALUES",- "DUMP",- "ORDER",- "VARYING",- "ELSE",- "OUTER",- "VIEW",- "END",- "OVER",- "WAITFOR",- "ERRLVL",- "PERCENT",- "WHEN",- "ESCAPE",- "PIVOT",- "WHERE",- "EXCEPT",- "PLAN",- "WHILE",- "EXEC",- "PRECISION",- "WITH",- "EXECUTE",- "PRIMARY",- "WITHIN GROUP",- "EXISTS",- "PRINT",- "WRITETEXT",- "EXIT",- "PROC",- };-- private static readonly string[] ReservedTopLevelWords- =- {- "ADD",- "ALTER COLUMN",- "ALTER TABLE",- "CASE",- "DELETE FROM",- "END",- "EXCEPT",- "FROM",- "GROUP BY",- "HAVING",- "INSERT INTO",- "INSERT",- "LIMIT",- "ORDER BY",- "SELECT",- "SET CURRENT SCHEMA",- "SET SCHEMA",- "SET",- "UPDATE",- "VALUES",- "WHERE",- };-- private static readonly string[] ReservedTopLevelWordsNoIndent- =- {- "INTERSECT",- "INTERSECT ALL",- "MINUS",- "UNION",- "UNION ALL"- };-- private static readonly string[] ReservedNewlineWords- =- {- "AND",- "ELSE",- "OR",- "WHEN",- "JOIN",- "INNER JOIN",- "LEFT JOIN",- "LEFT OUTER JOIN",- "RIGHT JOIN",- "RIGHT OUTER JOIN",- "FULL JOIN",- "FULL OUTER JOIN",- "CROSS JOIN",- "NATURAL JOIN",- };-- protected override Tokenizer GetTokenizer()- {- return- new Tokenizer(- ReservedWords,- ReservedTopLevelWords,- ReservedNewlineWords,- ReservedTopLevelWordsNoIndent,- stringTypes: new[] { "\"\"", "N''", "''", "``", "[]" },- openParens: new[] { "(", "CASE" },- closeParens: new[] { ")", "END" },- indexedPlaceholderTypes: Array.Empty<char>(),- namedPlaceholderTypes: new[] { '@' },- lineCommentTypes: new[] { "--" },- specialWordChars: new[] { "#", "@", "$" },- operators: new[]- {- ">=",- "<=",- "<>",- "!=",- "!<",- "!>",- "+=",- "-=",- "*=",- "/=",- "%=",- "|=",- "&=",- "^=",- "::"- });- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/SqlFormatterHelper.cs b/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/SqlFormatterHelper.csdeleted file mode 100644index 69879f7f1..000000000--- a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/SqlFormatterHelper.cs+++ /dev/null@@ -1,57 +0,0 @@-using System.Text;-using DevToys.Tools.Helpers.SqlFormatter.Core;-using DevToys.Tools.Helpers.SqlFormatter.Languages;--namespace DevToys.Tools.Helpers.SqlFormatter;--internal static class SqlFormatterHelper-{- internal static string Format(string sql, SqlLanguage language, SqlFormatterOptions options)- {- if (string.IsNullOrEmpty(sql))- {- return string.Empty;-- }-- Formatter formatter = language switch- {- SqlLanguage.Sql => new StandardSqlFormatter(),- SqlLanguage.Tsql => new TSqlFormatter(),- SqlLanguage.Spark => new SparkSqlFormatter(),- SqlLanguage.RedShift => new RedshiftFormatter(),- SqlLanguage.PostgreSql => new PostgreSqlFormatter(),- SqlLanguage.PlSql => new PlSqlFormatter(),- SqlLanguage.N1ql => new N1qlFormatter(),- SqlLanguage.MySql => new MySqlFormatter(),- SqlLanguage.MariaDb => new MariaDbFormatter(),- SqlLanguage.Db2 => new Db2Formatter(),- _ => throw new NotSupportedException(),- };-- return formatter.Format(sql, options);- }-- internal static ReadOnlySpan<char> Slice(this ReadOnlySpan<char> span, Token token)- {- return span.Slice(token.Index, token.Length);- }-- internal static void TrimSpaceEnd(this StringBuilder sb)- {- if (sb is null)- return;-- int lastIndex = sb.Length - 1;- int i = lastIndex;-- for (; i >= 0; i--)- {- if (sb[i] != ' ')- break;- }- int newLen = sb.Length - (lastIndex - i);-- sb.Length = newLen < 0 ? 0 : newLen;- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/SqlFormatterOptions.cs b/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/SqlFormatterOptions.csdeleted file mode 100644index 63ca1cfde..000000000--- a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/SqlFormatterOptions.cs+++ /dev/null@@ -1,8 +0,0 @@-namespace DevToys.Tools.Helpers.SqlFormatter;--internal readonly record struct SqlFormatterOptions(- Models.Indentation Indentation,- bool Uppercase,- int LinesBetweenQueries = 1,- bool UseLeadingComma = false,- IReadOnlyDictionary<string, string>? PlaceholderParameters = null);diff --git a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/SqlLanguage.cs b/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/SqlLanguage.csdeleted file mode 100644index 3c41e8793..000000000--- a/src/app/dev/DevToys.Tools/Helpers/SqlFormatter/SqlLanguage.cs+++ /dev/null@@ -1,15 +0,0 @@-namespace DevToys.Tools.Helpers.SqlFormatter;--public enum SqlLanguage-{- Sql,- Tsql,- Spark,- RedShift,- PostgreSql,- PlSql,- N1ql,- MySql,- MariaDb,- Db2-}diff --git a/src/app/dev/DevToys.Tools/Helpers/StringHelper.cs b/src/app/dev/DevToys.Tools/Helpers/StringHelper.csdeleted file mode 100644index 4d39b40ca..000000000--- a/src/app/dev/DevToys.Tools/Helpers/StringHelper.cs+++ /dev/null@@ -1,924 +0,0 @@-using System.Text;-using System.Text.RegularExpressions;-using DevToys.Tools.Helpers.Core;-using DevToys.Tools.Models;-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.Helpers;--internal static partial class StringHelper-{- [GeneratedRegex(@"\\[nrtfb\\""]")]- private static partial Regex EscapeCharactersRegex();-- internal static bool HasEscapeCharacters(string text)- {- return EscapeCharactersRegex().IsMatch(text);- }-- internal static ResultInfo<string> EscapeString(string? data, ILogger logger, CancellationToken cancellationToken)- {- if (string.IsNullOrWhiteSpace(data))- {- return new(string.Empty, hasSucceeded: true);- }-- var encoded = new StringBuilder();-- try- {- int i = 0;- while (i < data!.Length)- {- if (cancellationToken.IsCancellationRequested)- {- return new(string.Empty, hasSucceeded: false);- }-- string replacementString = string.Empty;- int jumpLength = 0;- if (TextMatchAtIndex(data, "\n", i))- {- jumpLength = 1;- replacementString = "\\n";- }- else if (TextMatchAtIndex(data, "\r", i))- {- jumpLength = 1;- replacementString = "\\r";- }- else if (TextMatchAtIndex(data, "\t", i))- {- jumpLength = 1;- replacementString = "\\t";- }- else if (TextMatchAtIndex(data, "\b", i))- {- jumpLength = 1;- replacementString = "\\b";- }- else if (TextMatchAtIndex(data, "\f", i))- {- jumpLength = 1;- replacementString = "\\f";- }- else if (TextMatchAtIndex(data, "\"", i))- {- jumpLength = 1;- replacementString = "\\\"";- }- else if (TextMatchAtIndex(data, "\\", i))- {- jumpLength = 1;- replacementString = "\\\\";- }-- if (!string.IsNullOrEmpty(replacementString) && jumpLength > 0)- {- encoded.Append(replacementString);- i += jumpLength;- }- else- {- encoded.Append(data[i]);- i++;- }- }- }- catch (Exception ex)- {- logger.LogError(ex, "Failed to escape text");- return new(ex.Message, hasSucceeded: false);- }-- return new(encoded.ToString(), hasSucceeded: true);- }-- internal static ResultInfo<string> UnescapeString(string? data, ILogger logger, CancellationToken cancellationToken)- {- if (string.IsNullOrWhiteSpace(data))- {- return new(string.Empty, hasSucceeded: false);- }-- var decoded = new StringBuilder();-- try- {- int i = 0;- while (i < data!.Length)- {- if (cancellationToken.IsCancellationRequested)- {- return new(string.Empty, hasSucceeded: false);- }-- string replacementString = string.Empty;- int jumpLength = 0;- if (TextMatchAtIndex(data, "\\n", i))- {- jumpLength = 2;- replacementString = "\n";- }- else if (TextMatchAtIndex(data, "\\r", i))- {- jumpLength = 2;- replacementString = "\r";- }- else if (TextMatchAtIndex(data, "\\t", i))- {- jumpLength = 2;- replacementString = "\t";- }- else if (TextMatchAtIndex(data, "\\b", i))- {- jumpLength = 2;- replacementString = "\b";- }- else if (TextMatchAtIndex(data, "\\f", i))- {- jumpLength = 2;- replacementString = "\f";- }- else if (TextMatchAtIndex(data, "\\\"", i))- {- jumpLength = 2;- replacementString = "\"";- }- else if (TextMatchAtIndex(data, "\\\\", i))- {- jumpLength = 2;- replacementString = "\\";- }-- if (!string.IsNullOrEmpty(replacementString) && jumpLength > 0)- {- decoded.Append(replacementString);- i += jumpLength;- }- else- {- decoded.Append(data[i]);- i++;- }- }- }- catch (Exception ex)- {- logger.LogError(ex, "Failed to escape text");- return new(ex.Message, hasSucceeded: false);- }-- return new(decoded.ToString(), hasSucceeded: true);- }-- internal static string SortLinesAlphabetically(string text, EndOfLineSequence endOfLineSequence)- {- return SortLines(- text,- lineComparer: (ReadOnlyMemory<char> x, ReadOnlyMemory<char> y) // Order alphabetically.- => System.MemoryExtensions.CompareTo(x.Span, y.Span, StringComparison.CurrentCulture),- endOfLineSequence);- }-- internal static string SortLinesAlphabeticallyDescending(string text, EndOfLineSequence endOfLineSequence)- {- return SortLines(- text,- lineComparer: (ReadOnlyMemory<char> x, ReadOnlyMemory<char> y) // Order reversed alphabetically.- => System.MemoryExtensions.CompareTo(y.Span, x.Span, StringComparison.CurrentCulture),- endOfLineSequence);- }-- internal static string SortLinesByLastWord(string text, EndOfLineSequence endOfLineSequence)- {- return SortLines(- text,- lineComparer: (ReadOnlyMemory<char> x, ReadOnlyMemory<char> y) => // Order alphabetically from the end of the line.- {- ReadOnlySpan<char> span1LastWord = x.Span.GetLastWord();- ReadOnlySpan<char> span2LastWord = y.Span.GetLastWord();-- return System.MemoryExtensions.CompareTo(span1LastWord, span2LastWord, StringComparison.CurrentCulture);- },- endOfLineSequence);- }-- internal static string SortLinesByLastWordDescending(string text, EndOfLineSequence endOfLineSequence)- {- return SortLines(- text,- lineComparer: (ReadOnlyMemory<char> x, ReadOnlyMemory<char> y) => // Order alphabetically from the end of the line.- {- ReadOnlySpan<char> span1LastWord = x.Span.GetLastWord();- ReadOnlySpan<char> span2LastWord = y.Span.GetLastWord();-- return System.MemoryExtensions.CompareTo(span2LastWord, span1LastWord, StringComparison.CurrentCulture);- },- endOfLineSequence);- }-- internal static string ReverseLines(string text, EndOfLineSequence endOfLineSequence)- {- if (string.IsNullOrEmpty(text))- {- return text;- }-- // Split text by lines.- List<ReadOnlyMemory<char>> lines = text.AsMemory().ToLines();-- // Reverse the order of the list.- lines.Reverse();-- // Rebuilt the text.- return lines.BuildStringFromListOfLines(endOfLineSequence);- }-- internal static string ShuffleLines(string text, EndOfLineSequence endOfLineSequence)- {- return SortLines(- text,- lineComparer: (ReadOnlyMemory<char> x, ReadOnlyMemory<char> y) => // Order randomly.- {- return Random.Shared.Next(-1, 1);- },- endOfLineSequence);- }-- internal static string ConvertLineBreakToLF(string text)- {- Guard.IsNotNull(text);- return Regex.Replace(text, @"\r\n?|\n", "\n");- }-- internal static string ConvertLineBreakToCRLF(string text)- {- Guard.IsNotNull(text);- return Regex.Replace(text, @"\r\n?|\n", "\r\n");- }-- internal static string ConvertToSentenceCase(string text, CancellationToken cancellationToken)- {- Guard.IsNotNull(text);-- if (text.Length == 0)- {- return text;- }-- return string.Create(text.Length, (text, cancellationToken), static (buffer, state) =>- {- ReadOnlySpan<char> textSpan = state.text.AsSpan();-- bool newSentence = true;- for (int i = 0; i < textSpan.Length; i++)- {- state.cancellationToken.ThrowIfCancellationRequested();- char @char = textSpan[i];-- EndOfLineSequence lineBreakType = EndOfLineSequence.Unknown;- if (IsSentenceTerminator(@char) || textSpan.IsLineBreak(i, out lineBreakType))- {- buffer[i] = @char;- newSentence = true;- if (lineBreakType == EndOfLineSequence.CarriageReturnLineFeed)- {- i++;- buffer[i] = textSpan[i];- }- continue;- }-- if (char.IsLetterOrDigit(@char))- {- if (newSentence)- {- buffer[i] = char.ToUpperInvariant(@char);- newSentence = false;- }- else- {- buffer[i] = char.ToLowerInvariant(@char);- }- continue;- }-- buffer[i] = @char;- }- });- }-- internal static string ConvertToTitleCase(string text, CancellationToken cancellationToken)- {- Guard.IsNotNull(text);-- if (text.Length == 0)- {- return text;- }-- return string.Create(text.Length, (text, cancellationToken), static (buffer, state) =>- {- ReadOnlySpan<char> textSpan = state.text.AsSpan();-- for (int i = 0; i < textSpan.Length; i++)- {- state.cancellationToken.ThrowIfCancellationRequested();-- if (i == 0 || !char.IsLetterOrDigit(textSpan[i - 1]))- {- buffer[i] = char.ToUpperInvariant(textSpan[i]);- }- else- {- buffer[i] = char.ToLowerInvariant(textSpan[i]);- }- }- });- }-- internal static string ConvertToCamelCase(string text, CancellationToken cancellationToken)- {- Guard.IsNotNull(text);- if (text.Length == 0)- {- return text;- }-- var camelCaseStringBuilder = new StringBuilder();- bool nextLetterOrDigitShouldBeUppercase = false;-- ReadOnlySpan<char> span = text.AsSpan();- for (int i = 0; i < span.Length; i++)- {- cancellationToken.ThrowIfCancellationRequested();-- char currentChar = span[i];- if (char.IsLetterOrDigit(currentChar))- {- if (nextLetterOrDigitShouldBeUppercase)- {- camelCaseStringBuilder.Append(char.ToUpperInvariant(currentChar));- nextLetterOrDigitShouldBeUppercase = false;- }- else- {- camelCaseStringBuilder.Append(char.ToLowerInvariant(currentChar));- }- }- else- {- if (span.IsLineBreak(i, out EndOfLineSequence lineBreakType))- {- nextLetterOrDigitShouldBeUppercase = false;- camelCaseStringBuilder.Append(currentChar);- if (lineBreakType == EndOfLineSequence.CarriageReturnLineFeed)- {- i++;- currentChar = span[i];- camelCaseStringBuilder.Append(currentChar);- }- }- else- {- nextLetterOrDigitShouldBeUppercase = true;- }- }- }-- return camelCaseStringBuilder.ToString();- }-- internal static string ConvertToPascalCase(string text, CancellationToken cancellationToken)- {- Guard.IsNotNull(text);- if (text.Length == 0)- {- return text;- }-- var pascalCaseStringBuilder = new StringBuilder();- bool nextLetterOrDigitShouldBeUppercase = true;-- ReadOnlySpan<char> span = text.AsSpan();- for (int i = 0; i < span.Length; i++)- {- cancellationToken.ThrowIfCancellationRequested();-- char currentChar = span[i];- if (char.IsLetterOrDigit(currentChar))- {- if (nextLetterOrDigitShouldBeUppercase)- {- pascalCaseStringBuilder.Append(char.ToUpperInvariant(currentChar));- nextLetterOrDigitShouldBeUppercase = false;- }- else- {- pascalCaseStringBuilder.Append(char.ToLowerInvariant(currentChar));- }- }- else- {- nextLetterOrDigitShouldBeUppercase = true;- if (span.IsLineBreak(i, out EndOfLineSequence lineBreakType))- {- pascalCaseStringBuilder.Append(currentChar);- if (lineBreakType == EndOfLineSequence.CarriageReturnLineFeed)- {- i++;- currentChar = span[i];- pascalCaseStringBuilder.Append(currentChar);- }- }- }- }-- return pascalCaseStringBuilder.ToString();- }-- internal static string ConvertToSnakeCase(string text, CancellationToken cancellationToken)- {- return SnakeConstantKebabCobolCaseConverter(text, '_', isUpperCase: false, cancellationToken);- }-- internal static string ConvertToConstantCase(string text, CancellationToken cancellationToken)- {- return SnakeConstantKebabCobolCaseConverter(text, '_', isUpperCase: true, cancellationToken);- }-- internal static string ConvertToKebabCase(string text, CancellationToken cancellationToken)- {- return SnakeConstantKebabCobolCaseConverter(text, '-', isUpperCase: false, cancellationToken);- }-- internal static string ConvertToCobolCase(string text, CancellationToken cancellationToken)- {- return SnakeConstantKebabCobolCaseConverter(text, '-', isUpperCase: true, cancellationToken);- }-- internal static string ConvertToTrainCase(string text, CancellationToken cancellationToken)- {- Guard.IsNotNull(text);- if (text.Length == 0)- {- return text;- }-- var snakeCaseStringBuilder = new StringBuilder();- ReadOnlySpan<char> span = text.AsSpan();-- bool nextNonLetterOrDigitShouldBeIgnored = true;- for (int i = 0; i < span.Length; i++)- {- cancellationToken.ThrowIfCancellationRequested();-- char currentChar = span[i];- if (char.IsLetterOrDigit(currentChar))- {- if (nextNonLetterOrDigitShouldBeIgnored)- {- snakeCaseStringBuilder.Append(char.ToUpperInvariant(currentChar));- }- else- {- snakeCaseStringBuilder.Append(char.ToLowerInvariant(currentChar));- }- nextNonLetterOrDigitShouldBeIgnored = false;- }- else if (span.IsLineBreak(i, out EndOfLineSequence lineBreakType))- {- nextNonLetterOrDigitShouldBeIgnored = true;- snakeCaseStringBuilder.Append(currentChar);- if (lineBreakType == EndOfLineSequence.CarriageReturnLineFeed)- {- i++;- currentChar = span[i];- snakeCaseStringBuilder.Append(currentChar);- }- }- else if (!nextNonLetterOrDigitShouldBeIgnored)- {- if (i < span.Length - 1- && char.IsLetterOrDigit(span[i + 1]))- {- nextNonLetterOrDigitShouldBeIgnored = true;- snakeCaseStringBuilder.Append('-');- }- }- }-- return snakeCaseStringBuilder.ToString();- }-- internal static string ConvertToAlternatingCase(string text, CancellationToken cancellationToken)- {- Guard.IsNotNull(text);-- if (text.Length == 0)- {- return text;- }-- return string.Create(text.Length, (text, cancellationToken), static (buffer, state) =>- {- ReadOnlySpan<char> textSpan = state.text.AsSpan();-- bool lowerCase = true;- for (int i = 0; i < textSpan.Length; i++)- {- state.cancellationToken.ThrowIfCancellationRequested();-- buffer[i] = lowerCase ? char.ToLowerInvariant(textSpan[i]) : char.ToUpperInvariant(textSpan[i]);-- lowerCase = !lowerCase;- }- });- }-- internal static string ConvertToInverseCase(string text, CancellationToken cancellationToken)- {- Guard.IsNotNull(text);-- if (text.Length == 0)- {- return text;- }-- return string.Create(text.Length, (text, cancellationToken), static (buffer, state) =>- {- ReadOnlySpan<char> textSpan = state.text.AsSpan();-- bool lowerCase = false;- for (int i = 0; i < textSpan.Length; i++)- {- state.cancellationToken.ThrowIfCancellationRequested();-- buffer[i] = lowerCase ? char.ToLowerInvariant(textSpan[i]) : char.ToUpperInvariant(textSpan[i]);-- lowerCase = !lowerCase;- }- });- }-- internal static string ConvertToRandomCase(string text, CancellationToken cancellationToken)- {- Guard.IsNotNull(text);-- if (text.Length == 0)- {- return text;- }-- return string.Create(text.Length, (text, cancellationToken), static (buffer, state) =>- {- ReadOnlySpan<char> textSpan = state.text.AsSpan();-- for (int i = 0; i < textSpan.Length; i++)- {- state.cancellationToken.ThrowIfCancellationRequested();-- bool isUpper = Random.Shared.Next() % 2 == 0;-- buffer[i] = isUpper ? char.ToUpperInvariant(textSpan[i]) : char.ToLowerInvariant(textSpan[i]);- }- });- }-- internal static EndOfLineSequence DetectLineBreakKind(string text, CancellationToken cancellationToken)- {- EndOfLineSequence overallLineBreakType = EndOfLineSequence.Unknown;- ReadOnlySpan<char> span = text.AsSpan();- for (int i = 0; i < span.Length; i++)- {- cancellationToken.ThrowIfCancellationRequested();-- if (span.IsLineBreak(i, out EndOfLineSequence lineBreakType))- {- // Detect the overall line break type of the text we're analyzing.- if (overallLineBreakType == EndOfLineSequence.Unknown)- {- overallLineBreakType = lineBreakType;- }- else if (overallLineBreakType != lineBreakType)- {- overallLineBreakType = EndOfLineSequence.Mixed;- break;- }-- if (lineBreakType == EndOfLineSequence.CarriageReturnLineFeed)- {- // If we found \r\n, skip the '\n' character.- i++;- continue;- }- }- }-- return overallLineBreakType;- }-- internal static void AnalyzeSpan(- string text,- TextSpan span,- CancellationToken cancellationToken,- out int spanLength,- out int spanStartPosition,- out int spanEndPosition,- out int spanLineNumber,- out int spanColumnNumber)- {- Guard.IsNotNull(text);- spanLength = span.Length;- spanStartPosition = span.StartPosition;- spanEndPosition = span.EndPosition;- spanLineNumber = CountLines(text, span.StartPosition);- int beginningOfLinePosition = text.LastIndexOf('\n', Math.Max(0, Math.Min(span.StartPosition - 1, text.Length - 1)));- if (beginningOfLinePosition == -1)- {- spanColumnNumber = span.StartPosition;- }- else- {- spanColumnNumber = Math.Max(span.StartPosition - beginningOfLinePosition - 1, 0);- }-- cancellationToken.ThrowIfCancellationRequested();- }-- internal static void AnalyzeText(- string text,- CancellationToken cancellationToken,- out int byteCount,- out int characterCount,- out int wordCount,- out int sentenceCount,- out int paragraphCount,- out int lineCount,- out EndOfLineSequence overallLineBreakType,- out Dictionary<char, int> characterFrequency,- out Dictionary<string, int> wordFrequency)- {- Guard.IsNotNull(text);- byteCount = Encoding.UTF8.GetByteCount(text);- characterCount = text.Length;- wordCount = 0;- sentenceCount = 0;- lineCount = 1;- paragraphCount = 1;- overallLineBreakType = EndOfLineSequence.Unknown;- characterFrequency = new Dictionary<char, int>();- wordFrequency = new Dictionary<string, int>();-- int sentenceBeginningPosition = 0;- int consecutiveLineBreakCount = 0;- bool isWordStart = true;- var wordBuilder = new StringBuilder();-- ReadOnlySpan<char> span = text.AsSpan();- for (int i = 0; i < span.Length; i++)- {- cancellationToken.ThrowIfCancellationRequested();-- char c = span[i];-- // Update the character distribution- UpdateCharacterFrequency(characterFrequency, c);-- bool isWordSeparator = IsWordSeparator(c);-- // If the current character is not a word separator, append it to the word builder- if (!isWordSeparator)- {- wordBuilder.Append(c);-- // If the current character is the start of a word, increment the word count- if (isWordStart)- {- wordCount++;- }- }- else if (wordBuilder.Length > 0)- {- // Otherwise, we reached the end of a word, let's update the word distribution- UpdateWordFrequency(wordFrequency, wordBuilder.ToString());- wordBuilder.Clear();- }-- isWordStart = isWordSeparator;-- // If we found a line break, increment the line count- if (span.IsLineBreak(i, out EndOfLineSequence lineBreakType))- {- lineCount++;- consecutiveLineBreakCount++;-- // Detect the overall line break type of the text we're analyzing.- if (overallLineBreakType == EndOfLineSequence.Unknown)- {- overallLineBreakType = lineBreakType;- }- else if (overallLineBreakType != lineBreakType)- {- overallLineBreakType = EndOfLineSequence.Mixed;- }-- if (lineBreakType == EndOfLineSequence.CarriageReturnLineFeed)- {- // If we found \r\n, skip the '\n' character.- i++;- continue;- }- }- else- {- // If there are more than one consecutive line breaks, we have a paragraph.- if (consecutiveLineBreakCount > 1)- {- paragraphCount++;- }-- consecutiveLineBreakCount = 0;- }-- // Detect sentences.- bool isSentenceTerminator = IsSentenceTerminator(c);- if (isSentenceTerminator && !IsSpanEmptyOrNotLetterAndDigit(text, TextSpan.FromBounds(sentenceBeginningPosition, i)))- {- sentenceCount++;- sentenceBeginningPosition = i + 1;- }- }-- // Detect final sentences.- if (sentenceBeginningPosition < text.Length - 1- && !IsSpanEmptyOrNotLetterAndDigit(text, TextSpan.FromBounds(sentenceBeginningPosition, text.Length - 1)))- {- sentenceCount++;- }- }-- private static void UpdateCharacterFrequency(Dictionary<char, int> characterDistribution, char c)- {- if (characterDistribution.TryGetValue(c, out int count))- {- characterDistribution[c] = ++count;- }- else- {- characterDistribution[c] = 1;- }- }-- private static void UpdateWordFrequency(Dictionary<string, int> wordDistribution, string word)- {- if (wordDistribution.TryGetValue(word, out int value))- {- wordDistribution[word] = ++value;- }- else- {- wordDistribution[word] = 1;- }- }-- private static bool IsWordSeparator(char c)- {- return char.IsWhiteSpace(c) || char.IsPunctuation(c);- }-- private static bool IsSentenceTerminator(char c)- {- return c == '.' || c == '?' || c == '!';- }-- private static bool IsSpanEmptyOrNotLetterAndDigit(string text, TextSpan span)- {- Guard.IsInRange(span.StartPosition, 0, text.Length, nameof(span));- Guard.IsInRange(span.EndPosition, 0, text.Length, nameof(span));-- for (int i = span.StartPosition; i < span.EndPosition; i++)- {- char currentChar = text[i];- if (char.IsLetterOrDigit(currentChar))- {- return false;- }- }-- return true;- }-- private static int CountLines(string text, int length)- {- int lineCount = 1;-- if (string.IsNullOrEmpty(text))- {- return lineCount;- }-- int index = -1;- while (-1 != (index = text.IndexOf('\n', index + 1, length - (index + 1))))- {- lineCount++;- }-- return lineCount;- }-- private static string SnakeConstantKebabCobolCaseConverter(string text, char spaceReplacement, bool isUpperCase, CancellationToken cancellationToken)- {- Guard.IsNotNull(text);- if (text.Length == 0)- {- return text;- }-- var snakeCaseStringBuilder = new StringBuilder();- ReadOnlySpan<char> span = text.AsSpan();-- bool nextNonLetterOrDigitShouldBeIgnored = true;- for (int i = 0; i < span.Length; i++)- {- cancellationToken.ThrowIfCancellationRequested();-- char currentChar = span[i];- if (char.IsLetterOrDigit(currentChar))- {- nextNonLetterOrDigitShouldBeIgnored = false;- if (isUpperCase)- {- snakeCaseStringBuilder.Append(char.ToUpperInvariant(currentChar));- }- else- {- snakeCaseStringBuilder.Append(char.ToLowerInvariant(currentChar));- }- }- else if (span.IsLineBreak(i, out EndOfLineSequence lineBreakType))- {- nextNonLetterOrDigitShouldBeIgnored = true;- snakeCaseStringBuilder.Append(currentChar);- if (lineBreakType == EndOfLineSequence.CarriageReturnLineFeed)- {- i++;- currentChar = span[i];- snakeCaseStringBuilder.Append(currentChar);- }- }- else if (!nextNonLetterOrDigitShouldBeIgnored)- {- if (i < span.Length - 1- && char.IsLetterOrDigit(span[i + 1]))- {- nextNonLetterOrDigitShouldBeIgnored = true;- snakeCaseStringBuilder.Append(spaceReplacement);- }- }- }-- return snakeCaseStringBuilder.ToString();- }-- private static string SortLines(string text, ReadOnlyMemoryOfCharComparerDelegate lineComparer, EndOfLineSequence endOfLineSequence = EndOfLineSequence.Unknown)- {- if (string.IsNullOrEmpty(text))- {- return string.Empty;- }-- // Split text by lines.- List<ReadOnlyMemory<char>> lines = text.AsMemory().ToLines();-- // Order lines.- lines.Sort(new CustomReadOnlyMemoryOfCharComparer(lineComparer));-- // Rebuilt the text.- return lines.BuildStringFromListOfLines(endOfLineSequence);- }-- private static bool TextMatchAtIndex(string data, string test, int startIndex)- {- if (string.IsNullOrEmpty(test))- {- return false;- }-- if (data.Length < test.Length)- {- return false;- }-- for (int i = 0; i < test.Length; i++)- {- if (data[startIndex + i] != test[i])- {- return false;- }- }-- return true;- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/UrlHelper.cs b/src/app/dev/DevToys.Tools/Helpers/UrlHelper.csdeleted file mode 100644index 6cf9b0541..000000000--- a/src/app/dev/DevToys.Tools/Helpers/UrlHelper.cs+++ /dev/null@@ -1,95 +0,0 @@-using DevToys.Tools.Models;-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.Helpers;--internal static partial class UrlHelper-{- internal static string EncodeOrDecode(string? input, EncodingConversion conversionMode, ILogger logger, CancellationToken cancellationToken)- {- string conversionResult- = conversionMode switch- {- EncodingConversion.Encode- => EncodeUrlData(- input,- logger,- cancellationToken),-- EncodingConversion.Decode- => DecodeUrlData(- input,- logger,- cancellationToken),-- _ => throw new NotSupportedException(),- };-- cancellationToken.ThrowIfCancellationRequested();-- return conversionResult;- }-- internal static string EncodeUrlData(string? data, ILogger logger, CancellationToken cancellationToken)- {- if (string.IsNullOrWhiteSpace(data))- {- return string.Empty;- }-- string encoded = string.Empty;- try- {- encoded = Uri.EscapeDataString(data);- cancellationToken.ThrowIfCancellationRequested();- }- catch (OperationCanceledException)- {- // ignore;- }- catch (Exception ex)- {- LogFailEncodeUrl(logger, ex);- return ex.Message;- }-- return encoded;- }-- internal static string DecodeUrlData(string? data, ILogger logger, CancellationToken cancellationToken)- {- if (string.IsNullOrWhiteSpace(data))- {- return string.Empty;- }-- string? decoded = string.Empty;-- try- {- decoded = Uri.UnescapeDataString(data);- cancellationToken.ThrowIfCancellationRequested();- }- catch (Exception ex) when (ex is OperationCanceledException || ex is FormatException)- {- // ignore;- }- catch (Exception ex)- {- LogFailDecodeUrl(logger, ex);- return ex.Message;- }-- return decoded;- }-- private static void LogFailEncodeUrl(ILogger logger, Exception exception)- {- logger.LogError(0, exception, $"Failed to encode text to Url.");- }-- private static void LogFailDecodeUrl(ILogger logger, Exception exception)- {- logger.LogError(1, exception, $"Failed to decode Url.");- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/UuidHelper.cs b/src/app/dev/DevToys.Tools/Helpers/UuidHelper.csdeleted file mode 100644index 2991679a7..000000000--- a/src/app/dev/DevToys.Tools/Helpers/UuidHelper.cs+++ /dev/null@@ -1,114 +0,0 @@-using DevToys.Tools.Models;--namespace DevToys.Tools.Helpers;-internal static class UuidHelper-{- private enum GuidVersion- {- TimeBased = 0x01,- Reserved = 0x02,- NameBased = 0x03,- Random = 0x04- }-- private static readonly Random random = new();-- private static readonly DateTimeOffset gregorianCalendarStart = new(1582, 10, 15, 0, 0, 0, TimeSpan.Zero);- private const int VariantByte = 8;- private const int VariantByteMask = 0x3f;- private const int VariantByteShift = 0x80;- private const int VersionByte = 7;- private const int VersionByteMask = 0x0f;- private const int VersionByteShift = 4;- private const int ByteArraySize = 16;- private const byte TimestampByte = 0;- private const byte NodeByte = 10;- private const byte GuidClockSequenceByte = 8;-- internal static string GenerateUuid(UuidVersion version, bool hyphens, bool uppercase)- {- string guidStringFormat;- if (hyphens)- {- guidStringFormat = "D";- }- else- {- guidStringFormat = "N";- }-- string? uuid;- if (version == UuidVersion.One)- {- uuid = GenerateTimeBasedGuid().ToString(guidStringFormat);- }- else- {- uuid = Guid.NewGuid().ToString(guidStringFormat);- }-- if (uppercase)- {- uuid = uuid.ToUpperInvariant();- }-- return uuid;- }-- private static Guid GenerateTimeBasedGuid()- {- DateTime dateTime = DateTime.UtcNow;- long ticks = dateTime.Ticks - gregorianCalendarStart.Ticks;-- byte[] guid = new byte[ByteArraySize];- byte[] timestamp = BitConverter.GetBytes(ticks);-- // copy node- byte[]? nodes = GenerateNodeBytes();- Array.Copy(nodes, 0, guid, NodeByte, Math.Min(6, nodes.Length));-- // copy clock sequence- byte[]? clockSequence = GenerateClockSequenceBytes(dateTime);- Array.Copy(clockSequence, 0, guid, GuidClockSequenceByte, Math.Min(2, clockSequence.Length));-- // copy timestamp- Array.Copy(timestamp, 0, guid, TimestampByte, Math.Min(8, timestamp.Length));-- // set the variant- guid[VariantByte] &= (byte)VariantByteMask;- guid[VariantByte] |= (byte)VariantByteShift;-- // set the version- guid[VersionByte] &= (byte)VersionByteMask;- guid[VersionByte] |= (byte)((byte)GuidVersion.TimeBased << VersionByteShift);-- return new Guid(guid);- }-- public static byte[] GenerateNodeBytes()- {- byte[]? node = new byte[6];-- random.NextBytes(node);- return node;- }-- public static byte[] GenerateClockSequenceBytes(DateTime dt)- {- DateTime utc = dt.ToUniversalTime();-- byte[]? bytes = BitConverter.GetBytes(utc.Ticks);-- if (bytes.Length == 0)- {- return new byte[] { 0x0, 0x0 };- }-- if (bytes.Length == 1)- {- return new byte[] { 0x0, bytes[0] };- }-- return new byte[] { bytes[0], bytes[1] };- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/XmlHelper.cs b/src/app/dev/DevToys.Tools/Helpers/XmlHelper.csdeleted file mode 100644index 8b786d7b4..000000000--- a/src/app/dev/DevToys.Tools/Helpers/XmlHelper.cs+++ /dev/null@@ -1,157 +0,0 @@-using System.Text;-using System.Text.RegularExpressions;-using System.Xml;-using DevToys.Tools.Models;-using Markdig.Helpers;-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.Helpers;--internal static class XmlHelper-{- /// <summary>- /// Detects whether the given string is a valid Xml or not.- /// </summary>- internal static bool IsValid(string? input, ILogger logger)- {- if (string.IsNullOrWhiteSpace(input))- {- return false;- }-- if (!ValidateFirstAndLastCharOfXml(input))- {- return false;- }-- try- {- var xmlDocument = new XmlDocument();-- // If loading failed, it's not valid Xml.- xmlDocument.LoadXml(input);-- return true;- }- catch (XmlException)- {- return false;- }- catch (Exception ex)- {- logger.LogError(ex, "Invalid data detected.");- return false;- }- }-- /// <summary>- /// Format a string to the specified Xml format.- /// </summary>- internal static ResultInfo<string> Format(string? input, Indentation indentationMode, bool newLineOnAttributes, ILogger logger)- {- if (string.IsNullOrWhiteSpace(input))- {- return new(string.Empty, false);- }-- try- {- var xmlDocument = new XmlDocument();- xmlDocument.LoadXml(input);-- if (xmlDocument.FirstChild == null)- {- return new(string.Empty, false);- }-- var xmlWriterSettings = new XmlWriterSettings()- {- Async = true,- OmitXmlDeclaration = xmlDocument.FirstChild.NodeType != XmlNodeType.XmlDeclaration,- NewLineOnAttributes = newLineOnAttributes,- };-- switch (indentationMode)- {- case Indentation.TwoSpaces:- xmlWriterSettings.Indent = true;- xmlWriterSettings.IndentChars = " ";- break;- case Indentation.FourSpaces:- xmlWriterSettings.Indent = true;- xmlWriterSettings.IndentChars = " ";- break;- case Indentation.OneTab:- xmlWriterSettings.Indent = true;- xmlWriterSettings.IndentChars = "\t";- break;- case Indentation.Minified:- xmlWriterSettings.Indent = false;- break;- default:- throw new NotSupportedException();- }-- var stringBuilder = new StringBuilder();- using (var xmlWriter = XmlWriter.Create(stringBuilder, xmlWriterSettings))- {- xmlDocument.Save(xmlWriter);- }-- if (xmlDocument.FirstChild.NodeType == XmlNodeType.XmlDeclaration)- {- Match match = Regex.Match(xmlDocument.FirstChild.InnerText, @"(?<=encoding\s*=\s*"")[^""]*", RegexOptions.None);- if (match.Success)- {- stringBuilder = stringBuilder.Replace("utf-16", match.Value);- }- else- {- stringBuilder = stringBuilder.Replace("encoding=\"utf-16\"", "");- }- }- return new(stringBuilder.ToString());- }- catch (XmlException ex)- {- return new(ex.Message, false);- }- catch (Exception ex) // some other exception- {- logger.LogError(ex, "Xml formatter. Indentation: {indentationMode}", indentationMode);- return new(ex.Message, false);- }- }-- /// <summary>- /// Validate that the XML starts with "<" and ends with ">", ignoring whitespace- /// </summary>- private static bool ValidateFirstAndLastCharOfXml(string input)- {- for (int i = 0; i < input.Length; ++i)- {- if (!input[i].IsWhitespace())- {- if (input[i] == '<')- {- break;- }- return false;- }- }-- for (int i = input.Length - 1; i >= 0; --i)- {- if (!input[i].IsWhitespace())- {- if (input[i] == '>')- {- return true;- }- return false;- }- }-- return false;- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/XsdHelper.cs b/src/app/dev/DevToys.Tools/Helpers/XsdHelper.csdeleted file mode 100644index 8329543cc..000000000--- a/src/app/dev/DevToys.Tools/Helpers/XsdHelper.cs+++ /dev/null@@ -1,219 +0,0 @@-using System.Text;-using System.Xml;-using System.Xml.Linq;-using System.Xml.Schema;-using System.Xml.XPath;-using DevToys.Tools.Models;-using DevToys.Tools.Tools.Testers.XMLTester;-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.Helpers;--internal static class XsdHelper-{- /// <summary>- /// Detects whether the given string is a valid XSD or not.- /// </summary>- internal static bool IsValid(string? input, ILogger logger)- {- try- {- using StringReader reader = new(input!);- var xmlSchema = XmlSchema.Read(reader, null);- return xmlSchema is not null;- }- catch (Exception ex) when (ex is XmlException || ex is XmlSchemaException)- {- return false;- }- catch (Exception ex)- {- logger.LogError(ex, "Invalid data detected.");- return false;- }- }-- internal static ResultInfo<string, XMLTesterResultSeverity> ValidateXmlAgainstXsd(string xsd, string xml, ILogger logger, CancellationToken cancellationToken)- {- Guard.IsNotNullOrWhiteSpace(xsd);- Guard.IsNotNullOrWhiteSpace(xml);-- try- {- XMLTesterResultSeverity hasSucceeded = XMLTesterResultSeverity.Success;- var errors = new StringBuilder();- void ValidationErrorCallBack(object? sender, ValidationEventArgs e)- {- cancellationToken.ThrowIfCancellationRequested();- hasSucceeded = e.Severity == XmlSeverityType.Warning ? XMLTesterResultSeverity.Warning : XMLTesterResultSeverity.Error;- errors.AppendLine(e.Message);- }-- // Load XSD document.- using StringReader reader = new(xsd!);- var xmlSchema = XmlSchema.Read(reader, ValidationErrorCallBack);-- if (xmlSchema is not null)- {- XmlSchemaSet xmlSchemaSet = new();- xmlSchemaSet.Add(xmlSchema);-- // Load XML document.- XDocument xmlDocument;- try- {- xmlDocument = XDocument.Parse(xml);- }- catch (XmlException ex)- {- return new ResultInfo<string, XMLTesterResultSeverity>($"XML: {ex.Message}", XMLTesterResultSeverity.Error);- }-- cancellationToken.ThrowIfCancellationRequested();-- // Validate XML against the XSD.- xmlDocument.Validate(xmlSchemaSet, ValidationErrorCallBack);-- if (hasSucceeded == XMLTesterResultSeverity.Success)- {- // XML will always be valid if it doesn't define a namespace. Let's verify that namespaces aren't missing.- var xsdDocument = XDocument.Parse(xsd);- IReadOnlyList<XmlNamespace> xsdNamespaces = GetAllNamespaces(xsdDocument);- IReadOnlyList<XmlNamespace> xmlNamespaces = GetAllNamespaces(xmlDocument);-- cancellationToken.ThrowIfCancellationRequested();-- IEnumerable<XmlNamespace> namespacesMissingInXsd- = GetMissingNamespacesInXsd(xsdNamespaces, xmlSchema.TargetNamespace, xmlNamespaces);-- bool areAllNamespacesDefinedInXsd = !namespacesMissingInXsd.Any();- if (!areAllNamespacesDefinedInXsd)- {- string missingNamespacesFormatted = FormatNamespaces(namespacesMissingInXsd);- return new ResultInfo<string, XMLTesterResultSeverity>(string.Format(XMLTester.XsdNamespacesInconsistentMsg, missingNamespacesFormatted), XMLTesterResultSeverity.Warning);- }-- bool isTargetNamespaceReferenceMissingInXml- = DetectMissingTargetNamespaceInXml(xmlSchema.TargetNamespace, xmlNamespaces, out string? missingTargetNamespaceUri);- if (isTargetNamespaceReferenceMissingInXml)- {- return new ResultInfo<string, XMLTesterResultSeverity>(string.Format(XMLTester.TargetNamespaceNotDefinedInXml, missingTargetNamespaceUri), XMLTesterResultSeverity.Warning);- }-- IEnumerable<XmlNamespace> namespacesMissingInXml- = GetMissingNamespacesInXml(xsdNamespaces, xmlNamespaces);-- bool areAllNamespacesDefinedInXml = !namespacesMissingInXml.Any();- if (!areAllNamespacesDefinedInXml)- {- string missingNamespacesFormatted = FormatNamespaces(namespacesMissingInXml);- return new ResultInfo<string, XMLTesterResultSeverity>(string.Format(XMLTester.XmlNamespacesInconsistentMsg, missingNamespacesFormatted), XMLTesterResultSeverity.Warning);- }- }- }-- return new ResultInfo<string, XMLTesterResultSeverity>(errors.ToString(), hasSucceeded);- }- catch (Exception ex) when (ex is XmlException || ex is XmlSchemaException)- {- return new ResultInfo<string, XMLTesterResultSeverity>($"XSD: {ex.Message}", XMLTesterResultSeverity.Error);- }- catch (Exception ex)- {- logger.LogError(ex, "Error while validation XML against XSD.");- }-- return new ResultInfo<string, XMLTesterResultSeverity>(string.Empty, XMLTesterResultSeverity.Error);- }-- /// <summary>- /// Identifies namespaces used within the XML data but not defined in the XSD schema.- /// </summary>- /// <param name="xsdParsingResult">XSD parsing result</param>- /// <param name="xmlParsingResult">XML parsing result</param>- /// <returns>The missing namespaces.</returns>- private static IEnumerable<XmlNamespace> GetMissingNamespacesInXsd(- IEnumerable<XmlNamespace> xsdNamespaces,- string? targetNamespace,- IEnumerable<XmlNamespace> xmlNamespaces)- {- IEnumerable<XmlNamespace> clearedXdsNamespaces = GetNamespacesFromXsd(xsdNamespaces);-- // filter targetNamespace- if (targetNamespace is not null)- {- xmlNamespaces = xmlNamespaces.Where(xns => !string.Equals(xns.Uri, targetNamespace, StringComparison.InvariantCultureIgnoreCase));- }-- return xmlNamespaces.Where(ns => clearedXdsNamespaces.Contains(ns) == false);- }-- /// <summary>- /// Identifies namespaces defined within the XSD schema but not used in the XML data.- /// </summary>- /// <param name="xsdParsingResult">XSD parsing result</param>- /// <param name="xmlParsingResult">XML parsing result</param>- /// <returns>The missing namespaces</returns>- private static IEnumerable<XmlNamespace> GetMissingNamespacesInXml(IEnumerable<XmlNamespace> xsdNamespaces, IEnumerable<XmlNamespace> xmlNamespaces)- {- IEnumerable<XmlNamespace> clearedXdsNamespaces = GetNamespacesFromXsd(xsdNamespaces);-- return clearedXdsNamespaces.Where(ns => xmlNamespaces.Contains(ns) == false);- }-- private static bool DetectMissingTargetNamespaceInXml(string? targetNamespace, IEnumerable<XmlNamespace> xmlNamespaces, out string? missingTargetNamespaceUri)- {- bool isTargetNamespaceDefinedInXml = xmlNamespaces.Select(ns => ns.Uri).Any(uri => string.Equals(uri, targetNamespace));- if (isTargetNamespaceDefinedInXml)- {- missingTargetNamespaceUri = null;- return false;- }-- missingTargetNamespaceUri = targetNamespace;- return true;- }-- private static IEnumerable<XmlNamespace> GetNamespacesFromXsd(IEnumerable<XmlNamespace> xsdNamespaces)- {- static bool IsDefaultXsdNamespace(XmlNamespace xmlNamespace) => xmlNamespace.Prefix.StartsWith("xs", StringComparison.InvariantCultureIgnoreCase);-- // return namespaces without default XSD namespace (xmlns:xs="http://www.w3.org/2001/XMLSchema")- return xsdNamespaces.Where(xns => !IsDefaultXsdNamespace(xns));- }-- /// <summary>- /// Extracts all <c>xmlns</c> namespaces from a given <paramref name="xmlDocument"/>.- /// </summary>- /// <param name="xmlDocument">XML document containing namespaces.</param>- /// <returns></returns>- private static IReadOnlyList<XmlNamespace> GetAllNamespaces(XDocument xmlDocument)- {- XPathNavigator? navigator = xmlDocument.CreateNavigator();- navigator.MoveToFollowing(XPathNodeType.Element);-- IDictionary<string, string> namespaces = navigator.GetNamespacesInScope(XmlNamespaceScope.ExcludeXml) ?? new Dictionary<string, string>();- return namespaces.Select(pair => new XmlNamespace(pair.Key, pair.Value)).ToList();- }-- private static string FormatNamespaces(IEnumerable<XmlNamespace> namespaces)- {- List<string> missingNamespaces = new();- foreach (XmlNamespace ns in namespaces)- {- string formattedPrefix;- if (string.Equals(ns.Prefix, string.Empty))- {- formattedPrefix = "xmlns";- }- else- {- formattedPrefix = $"xmlns:{ns.Prefix}";- }-- missingNamespaces.Add(formattedPrefix + $"=\"{ns.Uri}\"");- }-- return string.Join(", ", missingNamespaces);- }-}diff --git a/src/app/dev/DevToys.Tools/Helpers/YamlHelper.cs b/src/app/dev/DevToys.Tools/Helpers/YamlHelper.csdeleted file mode 100644index cd532d151..000000000--- a/src/app/dev/DevToys.Tools/Helpers/YamlHelper.cs+++ /dev/null@@ -1,148 +0,0 @@-using System.Text.Json;-using System.Text.Json.Nodes;-using DevToys.Tools.Models;-using Microsoft.Extensions.Logging;-using YamlDotNet.Core;-using YamlDotNet.Serialization;--namespace DevToys.Tools.Helpers;--internal static partial class YamlHelper-{- /// <summary>- /// Detects whether the given string is a valid YAML or not.- /// </summary>- internal static bool IsValid(string? input, ILogger logger)- {- if (string.IsNullOrWhiteSpace(input))- {- return false;- }-- input = input!.Trim();-- if (long.TryParse(input, out _))- {- return false;- }-- /// We check if the first and last characters are the ones that are expected for JSON.- /// TODO: check if we can use a YamlDotNet in strict mode to not parse JSON.- int length = input.Length - 1;- if ((input[0].Equals('{') && input[length].Equals('}')) ||- (input[0].Equals('[') && input[length].Equals(']')))- {- return false;- }-- try- {- object? result = new DeserializerBuilder().Build().Deserialize<object>(input);- return result is not null and not string;- }- catch (Exception ex)- {- logger.LogError(ex, "Invalid data detected.");- return false;- }- }-- /// <summary>- /// Convert a Json string to Yaml- /// </summary>- internal static ResultInfo<string> ConvertFromJson(- string? input,- Indentation indentation,- ILogger logger,- CancellationToken cancellationToken)- {- if (string.IsNullOrWhiteSpace(input))- {- return new(string.Empty, false);- }-- try- {-- var token = JsonNode.Parse(input, documentOptions: new() { CommentHandling = JsonCommentHandling.Skip });- if (token is null)- {- return new(string.Empty, false);- }-- object? jsonObject = ConvertJTokenToObject(token, 0);- cancellationToken.ThrowIfCancellationRequested();-- if (jsonObject is not null and not string)- {- int indent = 0;- indent = indentation switch- {- Indentation.TwoSpaces => 2,- Indentation.FourSpaces => 4,- _ => throw new NotSupportedException(),- };- var serializer- = Serializer.FromValueSerializer(- new SerializerBuilder().BuildValueSerializer(),- EmitterSettings.Default.WithBestIndent(indent).WithIndentedSequences());-- string? yaml = serializer.Serialize(jsonObject);- if (string.IsNullOrWhiteSpace(yaml))- {- return new(string.Empty, false);- }- cancellationToken.ThrowIfCancellationRequested();- return new(yaml);- }- return new(string.Empty, false);- }- catch (JsonException ex)- {- return new(ex.Message, false);- }- catch (Exception ex)- {- logger.LogError(ex, "Yaml to Json Converter");- return new(string.Empty, false);- }- }-- private static dynamic? ParseValue(JsonValue token)- {- var elem = (JsonElement)token.GetValue<object>();- return elem.ValueKind switch- {- JsonValueKind.String => elem.GetString(),- JsonValueKind.Number => elem.GetDecimal(),- JsonValueKind.False => false,- JsonValueKind.True => true,- JsonValueKind.Null => null,- JsonValueKind.Undefined or- JsonValueKind.Object or- JsonValueKind.Array or- _ => throw new NotSupportedException(),- };- }-- private static object? ConvertJTokenToObject(JsonNode? node, int level)- {- if (node is null)- {- return null;- }-- if (level > 10)- {- throw new InvalidDataException($"Json structure is not supported: nested level in array is too deep. ({level}).");- }- return node switch- {- JsonValue val => ParseValue(val),- JsonArray arr => arr.Select(o => ConvertJTokenToObject(o, level + 1)).ToList(),- JsonObject obj => obj.AsObject().ToDictionary(x => x.Key, x => ConvertJTokenToObject(x.Value, level)),- null => null,- _ => throw new InvalidOperationException("Unexpected token: " + node)- };- }-}diff --git a/src/app/dev/DevToys.Tools/Models/Base64Encoding.cs b/src/app/dev/DevToys.Tools/Models/Base64Encoding.csdeleted file mode 100644index 3f1ec6cb8..000000000--- a/src/app/dev/DevToys.Tools/Models/Base64Encoding.cs+++ /dev/null@@ -1,7 +0,0 @@-namespace DevToys.Tools.Models;--internal enum Base64Encoding-{- Utf8,- Ascii-}diff --git a/src/app/dev/DevToys.Tools/Models/CronScheduleCount.cs b/src/app/dev/DevToys.Tools/Models/CronScheduleCount.csdeleted file mode 100644index 41e4075fd..000000000--- a/src/app/dev/DevToys.Tools/Models/CronScheduleCount.cs+++ /dev/null@@ -1,10 +0,0 @@-namespace DevToys.Tools.Models;--internal enum CronScheduleCount-{- Five,- Ten,- TwentyFive,- Fifty,- OneHundred-}diff --git a/src/app/dev/DevToys.Tools/Models/DateFormat.cs b/src/app/dev/DevToys.Tools/Models/DateFormat.csdeleted file mode 100644index 8b5967d9d..000000000--- a/src/app/dev/DevToys.Tools/Models/DateFormat.cs+++ /dev/null@@ -1,8 +0,0 @@-namespace DevToys.Tools.Models;--internal enum DateFormat-{- Ticks,- Seconds,- Milliseconds-}diff --git a/src/app/dev/DevToys.Tools/Models/DateValueType.cs b/src/app/dev/DevToys.Tools/Models/DateValueType.csdeleted file mode 100644index 69a793ce0..000000000--- a/src/app/dev/DevToys.Tools/Models/DateValueType.cs+++ /dev/null@@ -1,12 +0,0 @@-namespace DevToys.Tools.Models;--internal enum DateValueType-{- Year,- Month,- Day,- Hour,- Minute,- Second,- Millisecond,-}diff --git a/src/app/dev/DevToys.Tools/Models/EncodingConversion.cs b/src/app/dev/DevToys.Tools/Models/EncodingConversion.csdeleted file mode 100644index 0b328c1c2..000000000--- a/src/app/dev/DevToys.Tools/Models/EncodingConversion.cs+++ /dev/null@@ -1,7 +0,0 @@-namespace DevToys.Tools.Models;--internal enum EncodingConversion-{- Encode = 0,- Decode = 1-}diff --git a/src/app/dev/DevToys.Tools/Models/EndOfLineSequence.cs b/src/app/dev/DevToys.Tools/Models/EndOfLineSequence.csdeleted file mode 100644index d2fcca659..000000000--- a/src/app/dev/DevToys.Tools/Models/EndOfLineSequence.cs+++ /dev/null@@ -1,26 +0,0 @@-namespace DevToys.Tools.Models;--internal enum EndOfLineSequence-{- Unknown = 0,- LineFeed = 1,- CarriageReturn = 2,- CarriageReturnLineFeed = 3,- Mixed = 4-}--internal static class EndOfLineSequenceExtensions-{- internal static string ToLineBreakCharacters(this EndOfLineSequence lineBreakType)- {- return lineBreakType switch- {- EndOfLineSequence.Unknown => Environment.NewLine,- EndOfLineSequence.LineFeed => "\n",- EndOfLineSequence.CarriageReturn => "\r",- EndOfLineSequence.CarriageReturnLineFeed => "\r\n",- EndOfLineSequence.Mixed => Environment.NewLine,- _ => throw new ArgumentOutOfRangeException(nameof(lineBreakType)),- };- }-}diff --git a/src/app/dev/DevToys.Tools/Models/HashingProgress.cs b/src/app/dev/DevToys.Tools/Models/HashingProgress.csdeleted file mode 100644index 289658bab..000000000--- a/src/app/dev/DevToys.Tools/Models/HashingProgress.cs+++ /dev/null@@ -1,19 +0,0 @@-namespace DevToys.Tools.Models;--internal sealed record HashingProgress-{- internal HashingProgress(long totalBytes, long completedBytes, CancellationToken cancellationToken)- {- TotalBytes = totalBytes;- CompletedBytes = completedBytes;- CancellationToken = cancellationToken;- }-- internal long TotalBytes { get; init; }-- internal long CompletedBytes { get; init; }-- internal CancellationToken CancellationToken { get; init; }-- internal double GetPercentage() => 100f * CompletedBytes / TotalBytes;-}diff --git a/src/app/dev/DevToys.Tools/Models/ImageConverterSupportedFormat.cs b/src/app/dev/DevToys.Tools/Models/ImageConverterSupportedFormat.csdeleted file mode 100644index 0f29d35d3..000000000--- a/src/app/dev/DevToys.Tools/Models/ImageConverterSupportedFormat.cs+++ /dev/null@@ -1,12 +0,0 @@-namespace DevToys.Tools.Models;--internal enum ImageConverterSupportedFormat-{- BMP,- JPEG,- PBM,- PNG,- TGA,- TIFF,- WEBP-}diff --git a/src/app/dev/DevToys.Tools/Models/Indentation.cs b/src/app/dev/DevToys.Tools/Models/Indentation.csdeleted file mode 100644index 1f92c9ff6..000000000--- a/src/app/dev/DevToys.Tools/Models/Indentation.cs+++ /dev/null@@ -1,9 +0,0 @@-namespace DevToys.Tools.Models;--internal enum Indentation-{- TwoSpaces,- FourSpaces,- OneTab,- Minified-}diff --git a/src/app/dev/DevToys.Tools/Models/JsonToYamlConversion.cs b/src/app/dev/DevToys.Tools/Models/JsonToYamlConversion.csdeleted file mode 100644index d8b5da6ea..000000000--- a/src/app/dev/DevToys.Tools/Models/JsonToYamlConversion.cs+++ /dev/null@@ -1,6 +0,0 @@-namespace DevToys.Tools.Models;-internal enum JsonToYamlConversion-{- JsonToYaml,- YamlToJson-}diff --git a/src/app/dev/DevToys.Tools/Models/JsonWebToken/DecoderParameters.cs b/src/app/dev/DevToys.Tools/Models/JsonWebToken/DecoderParameters.csdeleted file mode 100644index 04739954f..000000000--- a/src/app/dev/DevToys.Tools/Models/JsonWebToken/DecoderParameters.cs+++ /dev/null@@ -1,16 +0,0 @@-namespace DevToys.Tools.Models;--internal record DecoderParameters-{- public bool ValidateSignature { get; set; }-- public bool ValidateIssuersSigningKey { get; set; }-- public bool ValidateActors { get; set; }-- public bool ValidateLifetime { get; set; }-- public bool ValidateIssuers { get; set; }-- public bool ValidateAudiences { get; set; }-}diff --git a/src/app/dev/DevToys.Tools/Models/JsonWebToken/EncoderParameters.cs b/src/app/dev/DevToys.Tools/Models/JsonWebToken/EncoderParameters.csdeleted file mode 100644index a14bb2b67..000000000--- a/src/app/dev/DevToys.Tools/Models/JsonWebToken/EncoderParameters.cs+++ /dev/null@@ -1,12 +0,0 @@-namespace DevToys.Tools.Models;--internal record EncoderParameters-{- public bool HasExpiration { get; set; }-- public bool HasAudience { get; set; }-- public bool HasIssuer { get; set; }-- public bool HasDefaultTime { get; set; }-}diff --git a/src/app/dev/DevToys.Tools/Models/JsonWebToken/JsonWebTokenAlgorithm.cs b/src/app/dev/DevToys.Tools/Models/JsonWebToken/JsonWebTokenAlgorithm.csdeleted file mode 100644index 39c694eae..000000000--- a/src/app/dev/DevToys.Tools/Models/JsonWebToken/JsonWebTokenAlgorithm.cs+++ /dev/null@@ -1,17 +0,0 @@-namespace DevToys.Tools.Models;--internal enum JsonWebTokenAlgorithm-{- HS256,- HS384,- HS512,- RS256,- RS384,- RS512,- ES256,- ES384,- ES512,- PS256,- PS384,- PS512-}diff --git a/src/app/dev/DevToys.Tools/Models/JsonWebToken/JsonWebTokenClaim.cs b/src/app/dev/DevToys.Tools/Models/JsonWebToken/JsonWebTokenClaim.csdeleted file mode 100644index 9db5f9340..000000000--- a/src/app/dev/DevToys.Tools/Models/JsonWebToken/JsonWebTokenClaim.cs+++ /dev/null@@ -1,19 +0,0 @@-using System.Security.Claims;--namespace DevToys.Tools.Models;--internal class JsonWebTokenClaim-{- public string Key { get; }-- public TextSpan Span { get; }-- public string Value { get; set; }-- public JsonWebTokenClaim(string key, string value, TextSpan span)- {- Key = key;- Value = value;- Span = span;- }-}diff --git a/src/app/dev/DevToys.Tools/Models/JsonWebToken/JsonWebTokenPemEnumeration.cs b/src/app/dev/DevToys.Tools/Models/JsonWebToken/JsonWebTokenPemEnumeration.csdeleted file mode 100644index 2454db165..000000000--- a/src/app/dev/DevToys.Tools/Models/JsonWebToken/JsonWebTokenPemEnumeration.cs+++ /dev/null@@ -1,47 +0,0 @@-using System.Text;--namespace DevToys.Tools.Models.JwtDecoderEncoder;--internal class JsonWebTokenPemEnumeration-{- public static readonly JsonWebTokenPemEnumeration PublicKey = new("-----BEGIN PUBLIC KEY-----", "-----END PUBLIC KEY-----");-- public static readonly JsonWebTokenPemEnumeration PrivateKey = new("-----BEGIN PRIVATE KEY-----", "-----END PRIVATE KEY-----");-- public static readonly JsonWebTokenPemEnumeration RsaPublicKey = new("-----BEGIN RSA PUBLIC KEY-----", "-----END RSA PUBLIC KEY-----");-- public static readonly JsonWebTokenPemEnumeration RsaPrivateKey = new("-----BEGIN RSA PRIVATE KEY-----", "-----END RSA PRIVATE KEY-----");-- public static readonly JsonWebTokenPemEnumeration RsaEncryptedPrivateKey = new("-----BEGIN ENCRYPTED PRIVATE KEY-----", "-----END ENCRYPTED PRIVATE KEY-----");-- public static readonly JsonWebTokenPemEnumeration ECDPublicKey = new("-----BEGIN EC PUBLIC KEY-----", "-----END EC PUBLIC KEY-----");-- public static readonly JsonWebTokenPemEnumeration ECDPrivateKey = new("-----BEGIN EC PRIVATE KEY-----", "-----END EC PRIVATE KEY-----");-- public string PemStart { get; }-- public string PemEnd { get; }-- public static byte[] GetBytes(JsonWebTokenPemEnumeration jwtPem, string key)- {- var keyStringBuilder = new StringBuilder(key!.Trim());- keyStringBuilder.Replace(Environment.NewLine, string.Empty);- if (key.StartsWith(jwtPem.PemStart, StringComparison.OrdinalIgnoreCase))- {- keyStringBuilder.Remove(0, jwtPem.PemStart.Length);- }- if (key.Contains(jwtPem.PemEnd, StringComparison.OrdinalIgnoreCase))- {- keyStringBuilder.Replace(jwtPem.PemEnd, string.Empty);- }- return Convert.FromBase64String(keyStringBuilder.ToString());- }-- private JsonWebTokenPemEnumeration(string pemStart, string pemEnd)- {- Guard.IsNotNullOrWhiteSpace(pemStart);- Guard.IsNotNullOrWhiteSpace(pemEnd);- PemStart = pemStart;- PemEnd = pemEnd;- }-}diff --git a/src/app/dev/DevToys.Tools/Models/JsonWebToken/JsonWebTokenResult.cs b/src/app/dev/DevToys.Tools/Models/JsonWebToken/JsonWebTokenResult.csdeleted file mode 100644index 882430ef5..000000000--- a/src/app/dev/DevToys.Tools/Models/JsonWebToken/JsonWebTokenResult.cs+++ /dev/null@@ -1,19 +0,0 @@-namespace DevToys.Tools.Models;--internal class JsonWebTokenResult-{- public string? Token { get; set; }-- public string? Header { get; set; }-- public string? Payload { get; set; }- public string? Signature { get; set; }-- public string? PublicKey { get; set; }-- public string? PrivateKey { get; set; }-- public JsonWebTokenAlgorithm TokenAlgorithm { get; set; }-- public List<JsonWebTokenClaim> PayloadClaims { get; set; } = new List<JsonWebTokenClaim>();-}diff --git a/src/app/dev/DevToys.Tools/Models/JsonWebToken/JwtMode.cs b/src/app/dev/DevToys.Tools/Models/JsonWebToken/JwtMode.csdeleted file mode 100644index b47cb5203..000000000--- a/src/app/dev/DevToys.Tools/Models/JsonWebToken/JwtMode.cs+++ /dev/null@@ -1,7 +0,0 @@-namespace DevToys.Tools.Models;--internal enum JwtMode-{- Decode = 0,- Encode = 1-}diff --git a/src/app/dev/DevToys.Tools/Models/JsonWebToken/TokenParameters.cs b/src/app/dev/DevToys.Tools/Models/JsonWebToken/TokenParameters.csdeleted file mode 100644index d9b7ac111..000000000--- a/src/app/dev/DevToys.Tools/Models/JsonWebToken/TokenParameters.cs+++ /dev/null@@ -1,39 +0,0 @@-namespace DevToys.Tools.Models;--internal class TokenParameters-{- public string? Token { get; set; }-- public string? Payload { get; set; }-- public string? Signature { get; set; }-- public string? PublicKey { get; set; }-- public string? PrivateKey { get; set; }-- public JsonWebTokenAlgorithm TokenAlgorithm { get; set; }-- public int? ExpirationYear { get; set; }-- public int? ExpirationMonth { get; set; }-- public int? ExpirationDay { get; set; }-- public int? ExpirationHour { get; set; }-- public int? ExpirationMinute { get; set; }-- public HashSet<string> Issuers { get; set; } = new HashSet<string>();-- public HashSet<string> Audiences { get; set; } = new HashSet<string>();-- public void DefineExpirationDate(DateTimeOffset dateTimeOffset)- {- ExpirationYear = dateTimeOffset.Year;- ExpirationMonth = dateTimeOffset.Month;- ExpirationDay = dateTimeOffset.Day;- ExpirationHour = dateTimeOffset.Hour;- ExpirationMinute = dateTimeOffset.Minute;- }-}diff --git a/src/app/dev/DevToys.Tools/Models/ListComparisonMode.cs b/src/app/dev/DevToys.Tools/Models/ListComparisonMode.csdeleted file mode 100644index 2bd5c0498..000000000--- a/src/app/dev/DevToys.Tools/Models/ListComparisonMode.cs+++ /dev/null@@ -1,27 +0,0 @@-namespace DevToys.Tools.Models;--/// <summary>-/// Defines the different list comparaison mode-/// </summary>-internal enum ListComparisonMode-{- /// <summary>- /// Get elements which are presents in List A and List B- /// </summary>- AInterB,-- /// <summary>- /// Get elements which are presents in List A or List B- /// </summary>- AUnionB,-- /// <summary>- /// Get elements which are presents in List A but not in List B- /// /// </summary>- AOnly,-- /// <summary>- ///Get elements which are presents in List B but not in List A- /// </summary>- BOnly-}diff --git a/src/app/dev/DevToys.Tools/Models/MarkdownPreviewTheme.cs b/src/app/dev/DevToys.Tools/Models/MarkdownPreviewTheme.csdeleted file mode 100644index 673756c36..000000000--- a/src/app/dev/DevToys.Tools/Models/MarkdownPreviewTheme.cs+++ /dev/null@@ -1,6 +0,0 @@-namespace DevToys.Tools.Models;-internal enum MarkdownPreviewTheme-{- Dark,- Light-}diff --git a/src/app/dev/DevToys.Tools/Models/NumberBase/Binary.cs b/src/app/dev/DevToys.Tools/Models/NumberBase/Binary.csdeleted file mode 100644index a65d6f618..000000000--- a/src/app/dev/DevToys.Tools/Models/NumberBase/Binary.cs+++ /dev/null@@ -1,54 +0,0 @@-using System.Text;-using DevToys.Tools.Tools.Converters.NumberBase;--namespace DevToys.Tools.Models.NumberBase;--internal sealed class Binary : SignedLongNumberBaseDefinition-{- internal static readonly Binary Instance = new();-- private Binary() : base(NumberBaseConverter.Binary, baseNumber: 2)- {- }-- protected override string Format(string number)- {- var formattedNumber = new StringBuilder();- int count = 0;-- for (int i = number.Length - 1; i >= 0; i--)- {- if (count > 0 && count % 4 == 0)- {- formattedNumber.Insert(0, ' ');- }-- formattedNumber.Insert(0, number[i]);- count++;- }-- // Ensure the first block is always 4 characters- while (count % 4 != 0)- {- formattedNumber.Insert(0, '0');- count++;- }-- return formattedNumber.ToString();- }-- protected override string AdjustNotFormatted(string number)- {- var formattedNumber = new StringBuilder(number);- int count = formattedNumber.Length;-- // Ensure the first block is always 4 characters- while (count % 4 != 0)- {- formattedNumber.Insert(0, '0');- count++;- }-- return formattedNumber.ToString();- }-}diff --git a/src/app/dev/DevToys.Tools/Models/NumberBase/CustomUnsigned.cs b/src/app/dev/DevToys.Tools/Models/NumberBase/CustomUnsigned.csdeleted file mode 100644index dcee0905e..000000000--- a/src/app/dev/DevToys.Tools/Models/NumberBase/CustomUnsigned.cs+++ /dev/null@@ -1,14 +0,0 @@-using DevToys.Tools.Tools.Converters.NumberBase;--namespace DevToys.Tools.Models.NumberBase;--internal sealed class CustomUnsigned : UnsignedLongNumberBaseDefinition-{- internal CustomUnsigned(string dictionary)- : base(- NumberBaseConverter.CustomFormat,- dictionary,- isDictionaryCaseSensitive: true)- {- }-}diff --git a/src/app/dev/DevToys.Tools/Models/NumberBase/Decimal.cs b/src/app/dev/DevToys.Tools/Models/NumberBase/Decimal.csdeleted file mode 100644index 80a7f18e7..000000000--- a/src/app/dev/DevToys.Tools/Models/NumberBase/Decimal.cs+++ /dev/null@@ -1,24 +0,0 @@-using System.Globalization;-using DevToys.Tools.Tools.Converters.NumberBase;--namespace DevToys.Tools.Models.NumberBase;--internal sealed class Decimal : SignedLongNumberBaseDefinition-{- internal static readonly Decimal Instance = new();-- private Decimal() : base(NumberBaseConverter.Decimal, baseNumber: 10)- {- }-- protected override string Format(string number)- {- if (decimal.TryParse(number, NumberStyles.Any, CultureInfo.InvariantCulture, out decimal parsedNumber))- {- // Convert to string using current culture.- return parsedNumber.ToString("N0", CultureInfo.CurrentCulture);- }-- return number;- }-}diff --git a/src/app/dev/DevToys.Tools/Models/NumberBase/Hexadecimal.cs b/src/app/dev/DevToys.Tools/Models/NumberBase/Hexadecimal.csdeleted file mode 100644index 987de6d04..000000000--- a/src/app/dev/DevToys.Tools/Models/NumberBase/Hexadecimal.cs+++ /dev/null@@ -1,37 +0,0 @@-using System.Text;-using DevToys.Tools.Tools.Converters.NumberBase;--namespace DevToys.Tools.Models.NumberBase;--internal sealed class Hexadecimal : SignedLongNumberBaseDefinition-{- internal static readonly Hexadecimal Instance = new();-- private Hexadecimal() : base(NumberBaseConverter.Hexadecimal, baseNumber: 16)- {- }-- protected override string Format(string number)- {- var formattedNumber = new StringBuilder();- int count = 0;-- for (int i = number.Length - 1; i >= 0; i--)- {- if (count > 0 && count % 4 == 0)- {- formattedNumber.Insert(0, ' ');- }-- formattedNumber.Insert(0, char.ToUpper(number[i]));- count++;- }-- return formattedNumber.ToString();- }-- override protected string AdjustNotFormatted(string number)- {- return number.ToUpper();- }-}diff --git a/src/app/dev/DevToys.Tools/Models/NumberBase/INumberBaseDefinition.cs b/src/app/dev/DevToys.Tools/Models/NumberBase/INumberBaseDefinition.csdeleted file mode 100644index b02808f98..000000000--- a/src/app/dev/DevToys.Tools/Models/NumberBase/INumberBaseDefinition.cs+++ /dev/null@@ -1,25 +0,0 @@-namespace DevToys.Tools.Models.NumberBase;--internal interface INumberBaseDefinition<T> where T : struct-{- /// <summary>- /// Gets the display name of the number base.- /// </summary>- string DisplayName { get; }-- /// <summary>- /// Gets the maximum value of the number base. This value ensure that the number doesn't overflow and- /// is used to display to the user when the number is too large.- /// </summary>- T MaxValue { get; }-- /// <summary>- /// Parses a string to a number. Raises an exception if the number is invalid or overflow.- /// </summary>- T Parse(string number);-- /// <summary>- /// Converts a number to a string. If the format is true, the number is formatted.- /// </summary>- string ToFormattedString(T number, bool format);-}diff --git a/src/app/dev/DevToys.Tools/Models/NumberBase/Octal.cs b/src/app/dev/DevToys.Tools/Models/NumberBase/Octal.csdeleted file mode 100644index 588f8829b..000000000--- a/src/app/dev/DevToys.Tools/Models/NumberBase/Octal.cs+++ /dev/null@@ -1,32 +0,0 @@-using System.Text;-using DevToys.Tools.Tools.Converters.NumberBase;--namespace DevToys.Tools.Models.NumberBase;--internal sealed class Octal : SignedLongNumberBaseDefinition-{- internal static readonly Octal Instance = new();-- private Octal() : base(NumberBaseConverter.Octal, baseNumber: 8)- {- }-- protected override string Format(string number)- {- var formattedNumber = new StringBuilder();- int count = 0;-- for (int i = number.Length - 1; i >= 0; i--)- {- if (count > 0 && count % 3 == 0)- {- formattedNumber.Insert(0, ' ');- }-- formattedNumber.Insert(0, number[i]);- count++;- }-- return formattedNumber.ToString();- }-}diff --git a/src/app/dev/DevToys.Tools/Models/NumberBase/RFC4648Base16.cs b/src/app/dev/DevToys.Tools/Models/NumberBase/RFC4648Base16.csdeleted file mode 100644index 75e70151b..000000000--- a/src/app/dev/DevToys.Tools/Models/NumberBase/RFC4648Base16.cs+++ /dev/null@@ -1,16 +0,0 @@-using DevToys.Tools.Tools.Converters.NumberBase;--namespace DevToys.Tools.Models.NumberBase;--internal sealed class RFC4648Base16 : UnsignedLongNumberBaseDefinition-{- internal static readonly RFC4648Base16 Instance = new();-- private RFC4648Base16()- : base(- displayName: NumberBaseConverter.RFC4648Base16,- dictionary: "0123456789ABCDEF",- isDictionaryCaseSensitive: false)- {- }-}diff --git a/src/app/dev/DevToys.Tools/Models/NumberBase/RFC4648Base32.cs b/src/app/dev/DevToys.Tools/Models/NumberBase/RFC4648Base32.csdeleted file mode 100644index 454ed4d48..000000000--- a/src/app/dev/DevToys.Tools/Models/NumberBase/RFC4648Base32.cs+++ /dev/null@@ -1,16 +0,0 @@-using DevToys.Tools.Tools.Converters.NumberBase;--namespace DevToys.Tools.Models.NumberBase;--internal sealed class RFC4648Base32 : UnsignedLongNumberBaseDefinition-{- internal static readonly RFC4648Base32 Instance = new();-- private RFC4648Base32()- : base(- displayName: NumberBaseConverter.RFC4648Base32,- dictionary: "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567",- isDictionaryCaseSensitive: true)- {- }-}diff --git a/src/app/dev/DevToys.Tools/Models/NumberBase/RFC4648Base32ExtendedHex.cs b/src/app/dev/DevToys.Tools/Models/NumberBase/RFC4648Base32ExtendedHex.csdeleted file mode 100644index a3da0bcfd..000000000--- a/src/app/dev/DevToys.Tools/Models/NumberBase/RFC4648Base32ExtendedHex.cs+++ /dev/null@@ -1,16 +0,0 @@-using DevToys.Tools.Tools.Converters.NumberBase;--namespace DevToys.Tools.Models.NumberBase;--internal sealed class RFC4648Base32ExtendedHex : UnsignedLongNumberBaseDefinition-{- internal static readonly RFC4648Base32ExtendedHex Instance = new();-- private RFC4648Base32ExtendedHex()- : base(- displayName: NumberBaseConverter.RFC4648Base32ExtendedHex,- dictionary: "0123456789ABCDEFGHIJKLMNOPQRSTUV",- isDictionaryCaseSensitive: true)- {- }-}diff --git a/src/app/dev/DevToys.Tools/Models/NumberBase/RFC4648Base64.cs b/src/app/dev/DevToys.Tools/Models/NumberBase/RFC4648Base64.csdeleted file mode 100644index d0a3d1a7a..000000000--- a/src/app/dev/DevToys.Tools/Models/NumberBase/RFC4648Base64.cs+++ /dev/null@@ -1,16 +0,0 @@-using DevToys.Tools.Tools.Converters.NumberBase;--namespace DevToys.Tools.Models.NumberBase;--internal sealed class RFC4648Base64 : UnsignedLongNumberBaseDefinition-{- internal static readonly RFC4648Base64 Instance = new();-- private RFC4648Base64()- : base(- displayName: NumberBaseConverter.RFC4648Base64,- dictionary: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",- isDictionaryCaseSensitive: true)- {- }-}diff --git a/src/app/dev/DevToys.Tools/Models/NumberBase/RFC4648Base64UrlEncode.cs b/src/app/dev/DevToys.Tools/Models/NumberBase/RFC4648Base64UrlEncode.csdeleted file mode 100644index ac872afab..000000000--- a/src/app/dev/DevToys.Tools/Models/NumberBase/RFC4648Base64UrlEncode.cs+++ /dev/null@@ -1,16 +0,0 @@-using DevToys.Tools.Tools.Converters.NumberBase;--namespace DevToys.Tools.Models.NumberBase;--internal sealed class RFC4648Base64UrlEncode : UnsignedLongNumberBaseDefinition-{- internal static readonly RFC4648Base64UrlEncode Instance = new();-- private RFC4648Base64UrlEncode()- : base(- displayName: NumberBaseConverter.RFC4648Base64UrlEncode,- dictionary: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_",- isDictionaryCaseSensitive: true)- {- }-}diff --git a/src/app/dev/DevToys.Tools/Models/NumberBase/SignedLongNumberBaseDefinition.cs b/src/app/dev/DevToys.Tools/Models/NumberBase/SignedLongNumberBaseDefinition.csdeleted file mode 100644index 5b3770f37..000000000--- a/src/app/dev/DevToys.Tools/Models/NumberBase/SignedLongNumberBaseDefinition.cs+++ /dev/null@@ -1,46 +0,0 @@-namespace DevToys.Tools.Models.NumberBase;--internal abstract class SignedLongNumberBaseDefinition : INumberBaseDefinition<long>-{- private readonly int _base;-- protected SignedLongNumberBaseDefinition(string displayName, int baseNumber)- {- Guard.IsNotNullOrWhiteSpace(displayName);- Guard.IsGreaterThan(baseNumber, 0);- DisplayName = displayName;- _base = baseNumber;- }-- public string DisplayName { get; }-- public long MaxValue => long.MaxValue / _base;-- public string ToFormattedString(long number, bool format)- {- string stringNumber = Convert.ToString(number, toBase: _base);-- if (format)- {- stringNumber = Format(stringNumber);- }- else- {- stringNumber = AdjustNotFormatted(stringNumber);- }-- return stringNumber;- }-- public long Parse(string number)- {- return Convert.ToInt64(number, fromBase: _base);- }-- protected abstract string Format(string number);-- protected virtual string AdjustNotFormatted(string number)- {- return number;- }-}diff --git a/src/app/dev/DevToys.Tools/Models/NumberBase/UnsignedLongNumberBaseDefinition.cs b/src/app/dev/DevToys.Tools/Models/NumberBase/UnsignedLongNumberBaseDefinition.csdeleted file mode 100644index 9122630e3..000000000--- a/src/app/dev/DevToys.Tools/Models/NumberBase/UnsignedLongNumberBaseDefinition.cs+++ /dev/null@@ -1,138 +0,0 @@-using System.Text;--namespace DevToys.Tools.Models.NumberBase;--internal abstract class UnsignedLongNumberBaseDefinition : INumberBaseDefinition<ulong>-{- private readonly string _dictionary;- private readonly ulong _base;- private readonly bool _isDictionaryCaseSensitive;-- protected UnsignedLongNumberBaseDefinition(- string displayName,- string dictionary,- bool isDictionaryCaseSensitive)- {- Guard.IsNotNullOrEmpty(dictionary);- Guard.HasSizeGreaterThanOrEqualTo(dictionary, 2);- Guard.IsNotNullOrWhiteSpace(displayName);- _dictionary = dictionary!;- _base = (ulong)dictionary.Length;- _isDictionaryCaseSensitive = isDictionaryCaseSensitive;- DisplayName = displayName;- }-- public string DisplayName { get; }-- public ulong MaxValue => ulong.MaxValue / _base;-- public string ToFormattedString(ulong number, bool format)- {- // If the number is zero, return the first character of the dictionary as a string- if (number == 0)- {- return _dictionary[0].ToString();- }-- var result = new StringBuilder();-- // Convert the number to a string representation using the dictionary- // by repeatedly dividing the number by the base and prepending the character- // at the index of the remainder in the dictionary to the result- while (number > 0)- {- ulong remainder = number % _base;- result.Insert(0, _dictionary[(int)remainder]);- number /= _base;- }-- string numberString = result.ToString();-- // If no formatting is required, return the string representation- if (!format)- {- return numberString;- }-- // If formatting is required, insert a space every four characters- // starting from the end of the string- var formattedNumber = new StringBuilder();- int count = 0;-- for (int i = numberString.Length - 1; i >= 0; i--)- {- if (count > 0 && count % 4 == 0)- {- formattedNumber.Insert(0, ' ');- }-- formattedNumber.Insert(0, numberString[i]);- count++;- }-- // Return the formatted string- return formattedNumber.ToString();- }-- public ulong Parse(string number)- {- // Let's use a unsigned long to store the result. Unsigned numbers are always positive.- ulong numericValue = 0;-- // Iterate over each character in the input string- for (int i = 0; i < number.Length; i++)- {- // Check if the current character is valid- char currentCharacter = number[i];- if (!IsCharacterValid(currentCharacter, out int indexOfCurrentCharacterInDictionary))- {- throw new InvalidOperationException();- }-- if (numericValue > MaxValue)- {- throw new OverflowException();- }-- // Calculate the new result. This is done by multiplying the current result by the base and adding the value of the current character.- // This is equivalent to shifting the current result left by the number of bits required to represent the base, and then adding the value of the current character.- ulong newNumericValue = numericValue * _base + (ulong)indexOfCurrentCharacterInDictionary;-- // Check if the new result is less than the old result (which would indicate an overflow)- if (newNumericValue < numericValue)- {- throw new OverflowException();- }-- // Update the result- numericValue = newNumericValue;- }-- return numericValue;- }-- private bool IsCharacterValid(char c, out int number)- {- if (!_isDictionaryCaseSensitive)- {- c = char.ToLowerInvariant(c);- }-- for (number = 0; number < _dictionary.Length; number++)- {- char dictionaryChar = _dictionary[number];- if (!_isDictionaryCaseSensitive)- {- dictionaryChar = char.ToLowerInvariant(dictionaryChar);- }-- if (dictionaryChar == c)- {- return true;- }- }-- number = -1;- return false;- }-}diff --git a/src/app/dev/DevToys.Tools/Models/UuidVersion.cs b/src/app/dev/DevToys.Tools/Models/UuidVersion.csdeleted file mode 100644index 7a88c14cf..000000000--- a/src/app/dev/DevToys.Tools/Models/UuidVersion.cs+++ /dev/null@@ -1,7 +0,0 @@-namespace DevToys.Tools.Models;--internal enum UuidVersion-{- One,- Four-}diff --git a/src/app/dev/DevToys.Tools/Models/XMLTesterResultSeverity.cs b/src/app/dev/DevToys.Tools/Models/XMLTesterResultSeverity.csdeleted file mode 100644index a873e36a6..000000000--- a/src/app/dev/DevToys.Tools/Models/XMLTesterResultSeverity.cs+++ /dev/null@@ -1,8 +0,0 @@-namespace DevToys.Tools.Models;--internal enum XMLTesterResultSeverity-{- Success,- Warning,- Error-}diff --git a/src/app/dev/DevToys.Tools/Models/XmlNamespace.cs b/src/app/dev/DevToys.Tools/Models/XmlNamespace.csdeleted file mode 100644index 8b0672885..000000000--- a/src/app/dev/DevToys.Tools/Models/XmlNamespace.cs+++ /dev/null@@ -1,5 +0,0 @@-namespace DevToys.Tools.Models;--internal record XmlNamespace(string Prefix, string Uri)-{-}diff --git a/src/app/dev/DevToys.Tools/Properties/AdditionGlobalUsings.cs b/src/app/dev/DevToys.Tools/Properties/AdditionGlobalUsings.csdeleted file mode 100644index b6402eb11..000000000--- a/src/app/dev/DevToys.Tools/Properties/AdditionGlobalUsings.cs+++ /dev/null@@ -1,2 +0,0 @@-global using DevToys.Api;-global using static DevToys.Api.GUI;diff --git a/src/app/dev/DevToys.Tools/SmartDetection/Base64ImageFileDataTypeDetector.cs b/src/app/dev/DevToys.Tools/SmartDetection/Base64ImageFileDataTypeDetector.csdeleted file mode 100644index 76d567b1e..000000000--- a/src/app/dev/DevToys.Tools/SmartDetection/Base64ImageFileDataTypeDetector.cs+++ /dev/null@@ -1,32 +0,0 @@-namespace DevToys.Tools.SmartDetection;--[Export(typeof(IDataTypeDetector))]-[DataTypeName("Base64ImageFile", baseName: PredefinedCommonDataTypeNames.File)]-internal sealed partial class Base64ImageFileDataTypeDetector : IDataTypeDetector-{- internal static readonly string[] SupportedFileTypes = new[]- {- "bmp",- "gif",- "ico",- "jpg",- "jpeg",- "png",- "svg",- "webp"- };-- public ValueTask<DataDetectionResult> TryDetectDataAsync(object data, DataDetectionResult? resultFromBaseDetector, CancellationToken cancellationToken)- {- if (resultFromBaseDetector is not null- && resultFromBaseDetector.Data is FileInfo dataFile)- {- if (SupportedFileTypes.Contains(dataFile.Extension.Trim('.'), StringComparer.OrdinalIgnoreCase))- {- return ValueTask.FromResult(new DataDetectionResult(Success: true, Data: dataFile));- }- }-- return ValueTask.FromResult(DataDetectionResult.Unsuccessful);- }-}diff --git a/src/app/dev/DevToys.Tools/SmartDetection/Base64TextDataTypeDetector.cs b/src/app/dev/DevToys.Tools/SmartDetection/Base64TextDataTypeDetector.csdeleted file mode 100644index afcb25219..000000000--- a/src/app/dev/DevToys.Tools/SmartDetection/Base64TextDataTypeDetector.cs+++ /dev/null@@ -1,27 +0,0 @@-using DevToys.Tools.Helpers;--namespace DevToys.Tools.SmartDetection;--[Export(typeof(IDataTypeDetector))]-[DataTypeName(PredefinedCommonDataTypeNames.Base64Text, baseName: PredefinedCommonDataTypeNames.Text)]-internal sealed partial class Base64TextDataTypeDetector : IDataTypeDetector-{- public ValueTask<DataDetectionResult> TryDetectDataAsync(object data, DataDetectionResult? resultFromBaseDetector, CancellationToken cancellationToken)- {- if (resultFromBaseDetector is not null- && resultFromBaseDetector.Data is string dataString- && !long.TryParse(dataString, out _)- && !string.IsNullOrWhiteSpace(dataString))- {- string? trimmedData = dataString.Trim();- bool isBase64 = Base64Helper.IsBase64DataStrict(trimmedData);-- if (isBase64)- {- return ValueTask.FromResult(new DataDetectionResult(Success: true, Data: dataString));- }- }-- return ValueTask.FromResult(DataDetectionResult.Unsuccessful);- }-}diff --git a/src/app/dev/DevToys.Tools/SmartDetection/CertificateDetector.cs b/src/app/dev/DevToys.Tools/SmartDetection/CertificateDetector.csdeleted file mode 100644index 60da295d9..000000000--- a/src/app/dev/DevToys.Tools/SmartDetection/CertificateDetector.cs+++ /dev/null@@ -1,27 +0,0 @@-using DevToys.Tools.Helpers;--namespace DevToys.Tools.SmartDetection;--[Export(typeof(IDataTypeDetector))]-[DataTypeName(InternalName, baseName: PredefinedCommonDataTypeNames.Text)]-internal sealed class CertificateDetector : IDataTypeDetector-{- internal const string InternalName = "Certificate";-- public ValueTask<DataDetectionResult> TryDetectDataAsync(object rawData, DataDetectionResult? resultFromBaseDetector, CancellationToken cancellationToken)- {- if (resultFromBaseDetector is not null- && resultFromBaseDetector.Data is string dataString- && !string.IsNullOrWhiteSpace(dataString))- {- bool isCertificate = CertificateHelper.TryDecodeCertificate(this.Log(), dataString, password: null, out string? _);-- if (isCertificate)- {- return ValueTask.FromResult(new DataDetectionResult(Success: true, Data: dataString));- }- }-- return ValueTask.FromResult(DataDetectionResult.Unsuccessful);- }-}diff --git a/src/app/dev/DevToys.Tools/SmartDetection/EscapedCharactersDetector.cs b/src/app/dev/DevToys.Tools/SmartDetection/EscapedCharactersDetector.csdeleted file mode 100644index e4eb1b929..000000000--- a/src/app/dev/DevToys.Tools/SmartDetection/EscapedCharactersDetector.cs+++ /dev/null@@ -1,29 +0,0 @@--using DevToys.Tools.Helpers;--namespace DevToys.Tools.SmartDetection;--[Export(typeof(IDataTypeDetector))]-[DataTypeName(InternalName, baseName: PredefinedCommonDataTypeNames.Text)]-internal sealed class EscapedCharactersDetector : IDataTypeDetector-{- internal const string InternalName = "TextWithEscapedCharacters";-- public ValueTask<DataDetectionResult> TryDetectDataAsync(object rawData, DataDetectionResult? resultFromBaseDetector, CancellationToken cancellationToken)- {- if (resultFromBaseDetector is not null- && resultFromBaseDetector.Data is string dataString- && !long.TryParse(dataString, out _)- && !string.IsNullOrWhiteSpace(dataString))- {- bool hasEscapedCharacters = StringHelper.HasEscapeCharacters(dataString);-- if (hasEscapedCharacters)- {- return ValueTask.FromResult(new DataDetectionResult(Success: true, Data: dataString));- }- }-- return ValueTask.FromResult(DataDetectionResult.Unsuccessful);- }-}diff --git a/src/app/dev/DevToys.Tools/SmartDetection/JsonDataTypeDetector.cs b/src/app/dev/DevToys.Tools/SmartDetection/JsonDataTypeDetector.csdeleted file mode 100644index ef112b431..000000000--- a/src/app/dev/DevToys.Tools/SmartDetection/JsonDataTypeDetector.cs+++ /dev/null@@ -1,35 +0,0 @@-using DevToys.Tools.Helpers;-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.SmartDetection;--[Export(typeof(IDataTypeDetector))]-[DataTypeName(PredefinedCommonDataTypeNames.Json, baseName: PredefinedCommonDataTypeNames.Text)]-internal sealed partial class JsonDataTypeDetector : IDataTypeDetector-{- private readonly ILogger _logger;-- [ImportingConstructor]- public JsonDataTypeDetector()- {- _logger = this.Log();- }-- public async ValueTask<DataDetectionResult> TryDetectDataAsync(- object data,- DataDetectionResult? resultFromBaseDetector,- CancellationToken cancellationToken)- {- if (resultFromBaseDetector is not null- && resultFromBaseDetector.Data is string dataString- && !long.TryParse(dataString, out _))- {- if (await JsonHelper.IsValidAsync(dataString, _logger, cancellationToken))- {- return new DataDetectionResult(Success: true, Data: dataString);- }- }-- return DataDetectionResult.Unsuccessful;- }-}diff --git a/src/app/dev/DevToys.Tools/SmartDetection/MarkdownDataTypeDetector.cs b/src/app/dev/DevToys.Tools/SmartDetection/MarkdownDataTypeDetector.csdeleted file mode 100644index a91ef7955..000000000--- a/src/app/dev/DevToys.Tools/SmartDetection/MarkdownDataTypeDetector.cs+++ /dev/null@@ -1,43 +0,0 @@-using System.Text.RegularExpressions;--namespace DevToys.Tools.SmartDetection;--[Export(typeof(IDataTypeDetector))]-[DataTypeName("Markdown", baseName: PredefinedCommonDataTypeNames.Text)]-internal sealed partial class MarkdownDataTypeDetector : IDataTypeDetector-{- [GeneratedRegex("^#{1,6}\\s", RegexOptions.Compiled)]- private static partial Regex HeaderRegex();-- [GeneratedRegex("\\*\\*.*\\*\\*", RegexOptions.Compiled)]- private static partial Regex BoldRegex();-- [GeneratedRegex("\\*.*\\*", RegexOptions.Compiled)]- private static partial Regex ItalicRegex();-- [GeneratedRegex("\\[.*\\]\\(.*\\)", RegexOptions.Compiled)]- private static partial Regex LinkRegex();-- [GeneratedRegex("!\\[.*\\]\\(.*\\)", RegexOptions.Compiled)]- private static partial Regex ImageRegex();-- public ValueTask<DataDetectionResult> TryDetectDataAsync(object data, DataDetectionResult? resultFromBaseDetector, CancellationToken cancellationToken)- {- if (resultFromBaseDetector is not null- && resultFromBaseDetector.Data is string dataString- && dataString.Length <= 10_000) // Perf: Don't try to detect Markdown in large strings as RegEx are expensive.- {- // Check if the input string contains any of the Markdown elements- if (HeaderRegex().IsMatch(dataString)- || BoldRegex().IsMatch(dataString)- || ItalicRegex().IsMatch(dataString)- || LinkRegex().IsMatch(dataString)- || ImageRegex().IsMatch(dataString))- {- return ValueTask.FromResult(new DataDetectionResult(Success: true, Data: dataString));- }- }-- return ValueTask.FromResult(DataDetectionResult.Unsuccessful);- }-}diff --git a/src/app/dev/DevToys.Tools/SmartDetection/NumberBaseDataTypeDetector.cs b/src/app/dev/DevToys.Tools/SmartDetection/NumberBaseDataTypeDetector.csdeleted file mode 100644index 95bf1143d..000000000--- a/src/app/dev/DevToys.Tools/SmartDetection/NumberBaseDataTypeDetector.cs+++ /dev/null@@ -1,23 +0,0 @@-using DevToys.Tools.Helpers;-using DevToys.Tools.Models.NumberBase;--namespace DevToys.Tools.SmartDetection;--[Export(typeof(IDataTypeDetector))]-[DataTypeName("NumberBase", baseName: PredefinedCommonDataTypeNames.Text)]-internal sealed class NumberBaseDataTypeDetector : IDataTypeDetector-{- public ValueTask<DataDetectionResult> TryDetectDataAsync(object rawData, DataDetectionResult? resultFromBaseDetector, CancellationToken cancellationToken)- {- if (resultFromBaseDetector is not null- && resultFromBaseDetector.Data is string dataString)- {- if (NumberBaseHelper.TryDetectNumberBase(dataString, out INumberBaseDefinition<long>? numberBaseDefinition))- {- return ValueTask.FromResult(new DataDetectionResult(Success: true, Data: (dataString, numberBaseDefinition)));- }- }-- return ValueTask.FromResult(DataDetectionResult.Unsuccessful);- }-}diff --git a/src/app/dev/DevToys.Tools/SmartDetection/StaticImageFileDataTypeDetector.cs b/src/app/dev/DevToys.Tools/SmartDetection/StaticImageFileDataTypeDetector.csdeleted file mode 100644index 45a1e3282..000000000--- a/src/app/dev/DevToys.Tools/SmartDetection/StaticImageFileDataTypeDetector.cs+++ /dev/null@@ -1,32 +0,0 @@-namespace DevToys.Tools.SmartDetection;--[Export(typeof(IDataTypeDetector))]-[DataTypeName("StaticImageFile", baseName: PredefinedCommonDataTypeNames.File)]-internal sealed partial class StaticImageFileDataTypeDetector : IDataTypeDetector-{- internal static readonly string[] SupportedFileTypes = new[]- {- ".bmp",- ".jpeg",- ".jpg",- ".pbm",- ".png",- ".tiff",- ".tga",- ".webp"- };-- public ValueTask<DataDetectionResult> TryDetectDataAsync(object data, DataDetectionResult? resultFromBaseDetector, CancellationToken cancellationToken)- {- if (resultFromBaseDetector is not null- && resultFromBaseDetector.Data is FileInfo dataFile)- {- if (SupportedFileTypes.Contains(dataFile.Extension, StringComparer.OrdinalIgnoreCase))- {- return ValueTask.FromResult(new DataDetectionResult(Success: true, Data: dataFile));- }- }-- return ValueTask.FromResult(DataDetectionResult.Unsuccessful);- }-}diff --git a/src/app/dev/DevToys.Tools/SmartDetection/StaticImageFilesDataTypeDetector.cs b/src/app/dev/DevToys.Tools/SmartDetection/StaticImageFilesDataTypeDetector.csdeleted file mode 100644index 66315c2eb..000000000--- a/src/app/dev/DevToys.Tools/SmartDetection/StaticImageFilesDataTypeDetector.cs+++ /dev/null@@ -1,29 +0,0 @@-namespace DevToys.Tools.SmartDetection;--[Export(typeof(IDataTypeDetector))]-[DataTypeName("StaticImageFiles", baseName: PredefinedCommonDataTypeNames.Files)]-internal sealed partial class StaticImageFilesDataTypeDetector : IDataTypeDetector-{- public ValueTask<DataDetectionResult> TryDetectDataAsync(object data, DataDetectionResult? resultFromBaseDetector, CancellationToken cancellationToken)- {- if (resultFromBaseDetector is not null- && resultFromBaseDetector.Data is FileInfo[] dataFiles)- {- var files = new List<FileInfo>();- for (int i = 0; i < dataFiles.Length; i++)- {- if (StaticImageFileDataTypeDetector.SupportedFileTypes.Contains(dataFiles[i].Extension, StringComparer.OrdinalIgnoreCase))- {- files.Add(dataFiles[i]);- }- }-- if (files.Count > 0)- {- return ValueTask.FromResult(new DataDetectionResult(Success: true, Data: files.ToArray()));- }- }-- return ValueTask.FromResult(DataDetectionResult.Unsuccessful);- }-}diff --git a/src/app/dev/DevToys.Tools/SmartDetection/XmlDataTypeDetector.cs b/src/app/dev/DevToys.Tools/SmartDetection/XmlDataTypeDetector.csdeleted file mode 100644index 55a6632c8..000000000--- a/src/app/dev/DevToys.Tools/SmartDetection/XmlDataTypeDetector.cs+++ /dev/null@@ -1,34 +0,0 @@-using DevToys.Tools.Helpers;-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.SmartDetection;--[Export(typeof(IDataTypeDetector))]-[DataTypeName(PredefinedCommonDataTypeNames.Xml, baseName: PredefinedCommonDataTypeNames.Text)]-internal sealed partial class XmlDataTypeDetector : IDataTypeDetector-{- private readonly ILogger _logger;-- [ImportingConstructor]- public XmlDataTypeDetector()- {- _logger = this.Log();- }-- public ValueTask<DataDetectionResult> TryDetectDataAsync(- object data,- DataDetectionResult? resultFromBaseDetector,- CancellationToken cancellationToken)- {- if (resultFromBaseDetector is not null- && resultFromBaseDetector.Data is string dataString)- {- if (XmlHelper.IsValid(dataString, _logger))- {- return ValueTask.FromResult(new DataDetectionResult(Success: true, Data: dataString));- }- }-- return ValueTask.FromResult(DataDetectionResult.Unsuccessful);- }-}diff --git a/src/app/dev/DevToys.Tools/SmartDetection/YamlDataTypeDetector.cs b/src/app/dev/DevToys.Tools/SmartDetection/YamlDataTypeDetector.csdeleted file mode 100644index e7cb37fd8..000000000--- a/src/app/dev/DevToys.Tools/SmartDetection/YamlDataTypeDetector.cs+++ /dev/null@@ -1,34 +0,0 @@-using DevToys.Tools.Helpers;-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.SmartDetection;--[Export(typeof(IDataTypeDetector))]-[DataTypeName(PredefinedCommonDataTypeNames.Yaml, baseName: PredefinedCommonDataTypeNames.Text)]-internal sealed partial class YamlDataTypeDetector : IDataTypeDetector-{- private readonly ILogger _logger;-- [ImportingConstructor]- public YamlDataTypeDetector()- {- _logger = this.Log();- }-- public ValueTask<DataDetectionResult> TryDetectDataAsync(- object data,- DataDetectionResult? resultFromBaseDetector,- CancellationToken cancellationToken)- {- if (resultFromBaseDetector is not null- && resultFromBaseDetector.Data is string dataString)- {- if (YamlHelper.IsValid(dataString, _logger))- {- return ValueTask.FromResult(new DataDetectionResult(Success: true, Data: dataString));- }- }-- return ValueTask.FromResult(DataDetectionResult.Unsuccessful);- }-}diff --git a/src/app/dev/DevToys.Tools/Strings/GlobalStrings/GlobalStrings.Designer.cs b/src/app/dev/DevToys.Tools/Strings/GlobalStrings/GlobalStrings.Designer.csdeleted file mode 100644index 946ab22ad..000000000--- a/src/app/dev/DevToys.Tools/Strings/GlobalStrings/GlobalStrings.Designer.cs+++ /dev/null@@ -1,126 +0,0 @@-//-------------------------------------------------------------------------------// <auto-generated>-// This code was generated by a tool.-// Runtime Version:4.0.30319.42000-//-// Changes to this file may cause incorrect behavior and will be lost if-// the code is regenerated.-// </auto-generated>-//--------------------------------------------------------------------------------namespace DevToys.Tools.Strings.GlobalStrings {- using System;--- /// <summary>- /// A strongly-typed resource class, for looking up localized strings, etc.- /// </summary>- // This class was auto-generated by the StronglyTypedResourceBuilder- // class via a tool like ResGen or Visual Studio.- // To add or remove a member, edit your .ResX file then rerun ResGen- // with the /str option, or rebuild your VS project.- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]- internal class GlobalStrings {-- private static global::System.Resources.ResourceManager resourceMan;-- private static global::System.Globalization.CultureInfo resourceCulture;-- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]- internal GlobalStrings() {- }-- /// <summary>- /// Returns the cached ResourceManager instance used by this class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Resources.ResourceManager ResourceManager {- get {- if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Tools.Strings.GlobalStrings.GlobalStrings", typeof(GlobalStrings).Assembly);- resourceMan = temp;- }- return resourceMan;- }- }-- /// <summary>- /// Overrides the current thread's CurrentUICulture property for all- /// resource lookups using this strongly typed resource class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Globalization.CultureInfo Culture {- get {- return resourceCulture;- }- set {- resourceCulture = value;- }- }-- /// <summary>- /// Looks up a localized string similar to Bytes.- /// </summary>- internal static string Bytes {- get {- return ResourceManager.GetString("Bytes", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to File '{0}' was not found..- /// </summary>- internal static string FileNotFound {- get {- return ResourceManager.GetString("FileNotFound", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to File '{0}' is not supported. Only files of type {1} are supported..- /// </summary>- internal static string FileTypeNotSupported {- get {- return ResourceManager.GetString("FileTypeNotSupported", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to GB.- /// </summary>- internal static string Gigabytes {- get {- return ResourceManager.GetString("Gigabytes", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to KB.- /// </summary>- internal static string Kilobytes {- get {- return ResourceManager.GetString("Kilobytes", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to MB.- /// </summary>- internal static string Megabytes {- get {- return ResourceManager.GetString("Megabytes", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to TB.- /// </summary>- internal static string Terabytes {- get {- return ResourceManager.GetString("Terabytes", resourceCulture);- }- }- }-}diff --git a/src/app/dev/DevToys.Tools/Strings/GlobalStrings/GlobalStrings.resx b/src/app/dev/DevToys.Tools/Strings/GlobalStrings/GlobalStrings.resxdeleted file mode 100644index 8c7bb2f7d..000000000--- a/src/app/dev/DevToys.Tools/Strings/GlobalStrings/GlobalStrings.resx+++ /dev/null@@ -1,143 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<root>- <!--- Microsoft ResX Schema-- Version 2.0-- The primary goals of this format is to allow a simple XML format- that is mostly human readable. The generation and parsing of the- various data types are done through the TypeConverter classes- associated with the data types.-- Example:-- ... ado.net/XML headers & schema ...- <resheader name="resmimetype">text/microsoft-resx</resheader>- <resheader name="version">2.0</resheader>- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">- <value>[base64 mime encoded serialized .NET Framework object]</value>- </data>- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>- <comment>This is a comment</comment>- </data>-- There are any number of "resheader" rows that contain simple- name/value pairs.-- Each data row contains a name, and value. The row also contains a- type or mimetype. Type corresponds to a .NET class that support- text/value conversion through the TypeConverter architecture.- Classes that don't support this are serialized and stored with the- mimetype set.-- The mimetype is used for serialized objects, and tells the- ResXResourceReader how to depersist the object. This is currently not- extensible. For a given mimetype the value must be set accordingly:-- Note - application/x-microsoft.net.object.binary.base64 is the format- that the ResXResourceWriter will generate, however the reader can- read any of the formats listed below.-- mimetype: application/x-microsoft.net.object.binary.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.soap.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.bytearray.base64- value : The object must be serialized into a byte array- : using a System.ComponentModel.TypeConverter- : and then encoded with base64 encoding.- -->- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />- <xsd:element name="root" msdata:IsDataSet="true">- <xsd:complexType>- <xsd:choice maxOccurs="unbounded">- <xsd:element name="metadata">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" />- </xsd:sequence>- <xsd:attribute name="name" use="required" type="xsd:string" />- <xsd:attribute name="type" type="xsd:string" />- <xsd:attribute name="mimetype" type="xsd:string" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="assembly">- <xsd:complexType>- <xsd:attribute name="alias" type="xsd:string" />- <xsd:attribute name="name" type="xsd:string" />- </xsd:complexType>- </xsd:element>- <xsd:element name="data">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="resheader">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" />- </xsd:complexType>- </xsd:element>- </xsd:choice>- </xsd:complexType>- </xsd:element>- </xsd:schema>- <resheader name="resmimetype">- <value>text/microsoft-resx</value>- </resheader>- <resheader name="version">- <value>2.0</value>- </resheader>- <resheader name="reader">- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <resheader name="writer">- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <data name="Bytes" xml:space="preserve">- <value>Bytes</value>- </data>- <data name="FileNotFound" xml:space="preserve">- <value>File '{0}' was not found.</value>- <comment>{0} is a file name.</comment>- </data>- <data name="FileTypeNotSupported" xml:space="preserve">- <value>File '{0}' is not supported. Only files of type {1} are supported.</value>- <comment>{0} is a file name. {1} is a list of file extensions</comment>- </data>- <data name="Gigabytes" xml:space="preserve">- <value>GB</value>- </data>- <data name="Kilobytes" xml:space="preserve">- <value>KB</value>- </data>- <data name="Megabytes" xml:space="preserve">- <value>MB</value>- </data>- <data name="Terabytes" xml:space="preserve">- <value>TB</value>- </data>-</root>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/Converters/Converters.Designer.cs b/src/app/dev/DevToys.Tools/Tools/Converters/Converters.Designer.csdeleted file mode 100644index 2aef2d278..000000000--- a/src/app/dev/DevToys.Tools/Tools/Converters/Converters.Designer.cs+++ /dev/null@@ -1,81 +0,0 @@-//-------------------------------------------------------------------------------// <auto-generated>-// This code was generated by a tool.-// Runtime Version:4.0.30319.42000-//-// Changes to this file may cause incorrect behavior and will be lost if-// the code is regenerated.-// </auto-generated>-//--------------------------------------------------------------------------------namespace DevToys.Tools.Tools.Converters {- using System;--- /// <summary>- /// A strongly-typed resource class, for looking up localized strings, etc.- /// </summary>- // This class was auto-generated by the StronglyTypedResourceBuilder- // class via a tool like ResGen or Visual Studio.- // To add or remove a member, edit your .ResX file then rerun ResGen- // with the /str option, or rebuild your VS project.- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]- internal class Converters {-- private static global::System.Resources.ResourceManager resourceMan;-- private static global::System.Globalization.CultureInfo resourceCulture;-- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]- internal Converters() {- }-- /// <summary>- /// Returns the cached ResourceManager instance used by this class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Resources.ResourceManager ResourceManager {- get {- if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Tools.Tools.Converters.Converters", typeof(Converters).Assembly);- resourceMan = temp;- }- return resourceMan;- }- }-- /// <summary>- /// Overrides the current thread's CurrentUICulture property for all- /// resource lookups using this strongly typed resource class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Globalization.CultureInfo Culture {- get {- return resourceCulture;- }- set {- resourceCulture = value;- }- }-- /// <summary>- /// Looks up a localized string similar to Converters.- /// </summary>- internal static string AccessibleName {- get {- return ResourceManager.GetString("AccessibleName", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Converters.- /// </summary>- internal static string DisplayTitle {- get {- return ResourceManager.GetString("DisplayTitle", resourceCulture);- }- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Converters/Converters.resx b/src/app/dev/DevToys.Tools/Tools/Converters/Converters.resxdeleted file mode 100644index bf18e98a6..000000000--- a/src/app/dev/DevToys.Tools/Tools/Converters/Converters.resx+++ /dev/null@@ -1,126 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<root>- <!--- Microsoft ResX Schema-- Version 2.0-- The primary goals of this format is to allow a simple XML format- that is mostly human readable. The generation and parsing of the- various data types are done through the TypeConverter classes- associated with the data types.-- Example:-- ... ado.net/XML headers & schema ...- <resheader name="resmimetype">text/microsoft-resx</resheader>- <resheader name="version">2.0</resheader>- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">- <value>[base64 mime encoded serialized .NET Framework object]</value>- </data>- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>- <comment>This is a comment</comment>- </data>-- There are any number of "resheader" rows that contain simple- name/value pairs.-- Each data row contains a name, and value. The row also contains a- type or mimetype. Type corresponds to a .NET class that support- text/value conversion through the TypeConverter architecture.- Classes that don't support this are serialized and stored with the- mimetype set.-- The mimetype is used for serialized objects, and tells the- ResXResourceReader how to depersist the object. This is currently not- extensible. For a given mimetype the value must be set accordingly:-- Note - application/x-microsoft.net.object.binary.base64 is the format- that the ResXResourceWriter will generate, however the reader can- read any of the formats listed below.-- mimetype: application/x-microsoft.net.object.binary.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.soap.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.bytearray.base64- value : The object must be serialized into a byte array- : using a System.ComponentModel.TypeConverter- : and then encoded with base64 encoding.- -->- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />- <xsd:element name="root" msdata:IsDataSet="true">- <xsd:complexType>- <xsd:choice maxOccurs="unbounded">- <xsd:element name="metadata">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" />- </xsd:sequence>- <xsd:attribute name="name" use="required" type="xsd:string" />- <xsd:attribute name="type" type="xsd:string" />- <xsd:attribute name="mimetype" type="xsd:string" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="assembly">- <xsd:complexType>- <xsd:attribute name="alias" type="xsd:string" />- <xsd:attribute name="name" type="xsd:string" />- </xsd:complexType>- </xsd:element>- <xsd:element name="data">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="resheader">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" />- </xsd:complexType>- </xsd:element>- </xsd:choice>- </xsd:complexType>- </xsd:element>- </xsd:schema>- <resheader name="resmimetype">- <value>text/microsoft-resx</value>- </resheader>- <resheader name="version">- <value>2.0</value>- </resheader>- <resheader name="reader">- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <resheader name="writer">- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <data name="AccessibleName" xml:space="preserve">- <value>Converters</value>- </data>- <data name="DisplayTitle" xml:space="preserve">- <value>Converters</value>- </data>-</root>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/Converters/Cron/CronParser.Designer.cs b/src/app/dev/DevToys.Tools/Tools/Converters/Cron/CronParser.Designer.csdeleted file mode 100644index c88275c01..000000000--- a/src/app/dev/DevToys.Tools/Tools/Converters/Cron/CronParser.Designer.cs+++ /dev/null@@ -1,243 +0,0 @@-//-------------------------------------------------------------------------------// <auto-generated>-// This code was generated by a tool.-// Runtime Version:4.0.30319.42000-//-// Changes to this file may cause incorrect behavior and will be lost if-// the code is regenerated.-// </auto-generated>-//--------------------------------------------------------------------------------namespace DevToys.Tools.Tools.Converters.Cron {- using System;--- /// <summary>- /// A strongly-typed resource class, for looking up localized strings, etc.- /// </summary>- // This class was auto-generated by the StronglyTypedResourceBuilder- // class via a tool like ResGen or Visual Studio.- // To add or remove a member, edit your .ResX file then rerun ResGen- // with the /str option, or rebuild your VS project.- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]- internal class CronParser {-- private static global::System.Resources.ResourceManager resourceMan;-- private static global::System.Globalization.CultureInfo resourceCulture;-- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]- internal CronParser() {- }-- /// <summary>- /// Returns the cached ResourceManager instance used by this class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Resources.ResourceManager ResourceManager {- get {- if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Tools.Tools.Converters.Cron.CronParser", typeof(CronParser).Assembly);- resourceMan = temp;- }- return resourceMan;- }- }-- /// <summary>- /// Overrides the current thread's CurrentUICulture property for all- /// resource lookups using this strongly typed resource class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Globalization.CultureInfo Culture {- get {- return resourceCulture;- }- set {- resourceCulture = value;- }- }-- /// <summary>- /// Looks up a localized string similar to Cron parsing tool.- /// </summary>- internal static string AccessibleName {- get {- return ResourceManager.GetString("AccessibleName", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Configuration.- /// </summary>- internal static string ConfigurationTitle {- get {- return ResourceManager.GetString("ConfigurationTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Cron description.- /// </summary>- internal static string CronDescriptionTitle {- get {- return ResourceManager.GetString("CronDescriptionTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Cron expression is not valid.- /// </summary>- internal static string CronErrorMessage {- get {- return ResourceManager.GetString("CronErrorMessage", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The Cron expression to parse.- /// </summary>- internal static string CronExpressionOptionDescription {- get {- return ResourceManager.GetString("CronExpressionOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Date time fomat of generated scheduled dates.- /// </summary>- internal static string DateFormatOptionDescription {- get {- return ResourceManager.GetString("DateFormatOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Parse Cron expression to get scheduled dates.- /// </summary>- internal static string Description {- get {- return ResourceManager.GetString("Description", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Whether the Cron expression includes seconds in its definition.- /// </summary>- internal static string IncludeSecondsOptionDescription {- get {- return ResourceManager.GetString("IncludeSecondsOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Cron expression to parse.- /// </summary>- internal static string InputTitle {- get {- return ResourceManager.GetString("InputTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Cron expression parser.- /// </summary>- internal static string LongDisplayTitle {- get {- return ResourceManager.GetString("LongDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Number of schedules to be generated.- /// </summary>- internal static string MaxScheduleCountOptionDescription {- get {- return ResourceManager.GetString("MaxScheduleCountOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to How many scheduled dates needs to be generated.- /// </summary>- internal static string OutputCountDescription {- get {- return ResourceManager.GetString("OutputCountDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Next scheduled dates.- /// </summary>- internal static string OutputCountTitle {- get {- return ResourceManager.GetString("OutputCountTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Date time fomat of upcoming dates.- /// </summary>- internal static string OutputFormatDescription {- get {- return ResourceManager.GetString("OutputFormatDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Output date time format is not valid.- /// </summary>- internal static string OutputFormatErrorMessage {- get {- return ResourceManager.GetString("OutputFormatErrorMessage", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Output format.- /// </summary>- internal static string OutputFormatTitle {- get {- return ResourceManager.GetString("OutputFormatTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Next scheduled dates.- /// </summary>- internal static string OutputScheduleTitle {- get {- return ResourceManager.GetString("OutputScheduleTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Cron parser.- /// </summary>- internal static string ShortDisplayTitle {- get {- return ResourceManager.GetString("ShortDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Whether the Cron expression should include seconds in its definition.- /// </summary>- internal static string UseSecondsDescription {- get {- return ResourceManager.GetString("UseSecondsDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Include seconds.- /// </summary>- internal static string UseSecondsTitle {- get {- return ResourceManager.GetString("UseSecondsTitle", resourceCulture);- }- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Converters/Cron/CronParser.resx b/src/app/dev/DevToys.Tools/Tools/Converters/Cron/CronParser.resxdeleted file mode 100644index 72a8c8171..000000000--- a/src/app/dev/DevToys.Tools/Tools/Converters/Cron/CronParser.resx+++ /dev/null@@ -1,180 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<root>- <!--- Microsoft ResX Schema-- Version 2.0-- The primary goals of this format is to allow a simple XML format- that is mostly human readable. The generation and parsing of the- various data types are done through the TypeConverter classes- associated with the data types.-- Example:-- ... ado.net/XML headers & schema ...- <resheader name="resmimetype">text/microsoft-resx</resheader>- <resheader name="version">2.0</resheader>- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">- <value>[base64 mime encoded serialized .NET Framework object]</value>- </data>- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>- <comment>This is a comment</comment>- </data>-- There are any number of "resheader" rows that contain simple- name/value pairs.-- Each data row contains a name, and value. The row also contains a- type or mimetype. Type corresponds to a .NET class that support- text/value conversion through the TypeConverter architecture.- Classes that don't support this are serialized and stored with the- mimetype set.-- The mimetype is used for serialized objects, and tells the- ResXResourceReader how to depersist the object. This is currently not- extensible. For a given mimetype the value must be set accordingly:-- Note - application/x-microsoft.net.object.binary.base64 is the format- that the ResXResourceWriter will generate, however the reader can- read any of the formats listed below.-- mimetype: application/x-microsoft.net.object.binary.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.soap.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.bytearray.base64- value : The object must be serialized into a byte array- : using a System.ComponentModel.TypeConverter- : and then encoded with base64 encoding.- -->- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />- <xsd:element name="root" msdata:IsDataSet="true">- <xsd:complexType>- <xsd:choice maxOccurs="unbounded">- <xsd:element name="metadata">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" />- </xsd:sequence>- <xsd:attribute name="name" use="required" type="xsd:string" />- <xsd:attribute name="type" type="xsd:string" />- <xsd:attribute name="mimetype" type="xsd:string" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="assembly">- <xsd:complexType>- <xsd:attribute name="alias" type="xsd:string" />- <xsd:attribute name="name" type="xsd:string" />- </xsd:complexType>- </xsd:element>- <xsd:element name="data">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="resheader">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" />- </xsd:complexType>- </xsd:element>- </xsd:choice>- </xsd:complexType>- </xsd:element>- </xsd:schema>- <resheader name="resmimetype">- <value>text/microsoft-resx</value>- </resheader>- <resheader name="version">- <value>2.0</value>- </resheader>- <resheader name="reader">- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <resheader name="writer">- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <data name="AccessibleName" xml:space="preserve">- <value>Cron parsing tool</value>- </data>- <data name="ConfigurationTitle" xml:space="preserve">- <value>Configuration</value>- </data>- <data name="CronDescriptionTitle" xml:space="preserve">- <value>Cron description</value>- </data>- <data name="CronErrorMessage" xml:space="preserve">- <value>Cron expression is not valid</value>- </data>- <data name="CronExpressionOptionDescription" xml:space="preserve">- <value>The Cron expression to parse</value>- </data>- <data name="DateFormatOptionDescription" xml:space="preserve">- <value>Date time fomat of generated scheduled dates</value>- </data>- <data name="Description" xml:space="preserve">- <value>Parse Cron expression to get scheduled dates</value>- </data>- <data name="IncludeSecondsOptionDescription" xml:space="preserve">- <value>Whether the Cron expression includes seconds in its definition</value>- </data>- <data name="InputTitle" xml:space="preserve">- <value>Cron expression to parse</value>- </data>- <data name="LongDisplayTitle" xml:space="preserve">- <value>Cron expression parser</value>- </data>- <data name="MaxScheduleCountOptionDescription" xml:space="preserve">- <value>Number of schedules to be generated</value>- </data>- <data name="OutputCountDescription" xml:space="preserve">- <value>How many scheduled dates needs to be generated</value>- </data>- <data name="OutputCountTitle" xml:space="preserve">- <value>Next scheduled dates</value>- </data>- <data name="OutputFormatDescription" xml:space="preserve">- <value>Date time fomat of upcoming dates</value>- </data>- <data name="OutputFormatErrorMessage" xml:space="preserve">- <value>Output date time format is not valid</value>- </data>- <data name="OutputFormatTitle" xml:space="preserve">- <value>Output format</value>- </data>- <data name="OutputScheduleTitle" xml:space="preserve">- <value>Next scheduled dates</value>- </data>- <data name="ShortDisplayTitle" xml:space="preserve">- <value>Cron parser</value>- </data>- <data name="UseSecondsDescription" xml:space="preserve">- <value>Whether the Cron expression should include seconds in its definition</value>- </data>- <data name="UseSecondsTitle" xml:space="preserve">- <value>Include seconds</value>- </data>-</root>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/Converters/Cron/CronParserCommandLineTool.cs b/src/app/dev/DevToys.Tools/Tools/Converters/Cron/CronParserCommandLineTool.csdeleted file mode 100644index f7fa673d7..000000000--- a/src/app/dev/DevToys.Tools/Tools/Converters/Cron/CronParserCommandLineTool.cs+++ /dev/null@@ -1,72 +0,0 @@-using DevToys.Tools.Helpers;-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.Tools.Converters.Cron;--[Export(typeof(ICommandLineTool))]-[Name("CronParser")]-[CommandName(- Name = "cronparser",- Alias = "cron",- ResourceManagerBaseName = "DevToys.Tools.Tools.Converters.Cron.CronParser",- DescriptionResourceName = nameof(CronParser.Description))]-internal sealed class CronParserCommandLineTool : ICommandLineTool-{- [CommandLineOption(- Name = "seconds",- Alias = "s",- DescriptionResourceName = nameof(CronParser.IncludeSecondsOptionDescription))]- internal bool IncludeSeconds { get; set; } = true;-- [CommandLineOption(- Name = "scheduleCount",- Alias = "c",- DescriptionResourceName = nameof(CronParser.MaxScheduleCountOptionDescription))]- internal int MaxScheduleCount { get; set; } = 5;-- [CommandLineOption(- Name = "dateFormat",- Alias = "d",- DescriptionResourceName = nameof(CronParser.DateFormatOptionDescription))]- internal string DateFormat { get; set; } = "yyyy-MM-dd ddd HH:mm:ss";-- [CommandLineOption(- Name = "expression",- Alias = "e",- IsRequired = true,- DescriptionResourceName = nameof(CronParser.CronExpressionOptionDescription))]- internal string CronExpression { get; set; } = string.Empty;-- public ValueTask<int> InvokeAsync(ILogger logger, CancellationToken cancellationToken)- {- bool succeeded- = CronHelper.TryGenerateNextSchedulesAndDescription(- CronExpression,- DateFormat,- IncludeSeconds,- MaxScheduleCount,- out string schedule,- out string description,- out string error);-- if (!string.IsNullOrEmpty(description))- {- Console.WriteLine(description);- }-- if (!string.IsNullOrEmpty(schedule))- {- Console.WriteLine(schedule);- }-- if (succeeded)- {- return ValueTask.FromResult(0);- }- else- {- Console.Error.WriteLine(error);- return ValueTask.FromResult(-1);- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Converters/Cron/CronParserGuiTool.cs b/src/app/dev/DevToys.Tools/Tools/Converters/Cron/CronParserGuiTool.csdeleted file mode 100644index 92746caae..000000000--- a/src/app/dev/DevToys.Tools/Tools/Converters/Cron/CronParserGuiTool.cs+++ /dev/null@@ -1,224 +0,0 @@-using DevToys.Tools.Helpers;-using DevToys.Tools.Models;--namespace DevToys.Tools.Tools.Converters.Cron;--[Export(typeof(IGuiTool))]-[Name("CronParser")]-[ToolDisplayInformation(- IconFontName = "DevToys-Tools-Icons",- IconGlyph = '\u0104',- GroupName = PredefinedCommonToolGroupNames.Converters,- ResourceManagerAssemblyIdentifier = nameof(DevToysToolsResourceManagerAssemblyIdentifier),- ResourceManagerBaseName = "DevToys.Tools.Tools.Converters.Cron.CronParser",- ShortDisplayTitleResourceName = nameof(CronParser.ShortDisplayTitle),- LongDisplayTitleResourceName = nameof(CronParser.LongDisplayTitle),- DescriptionResourceName = nameof(CronParser.Description),- AccessibleNameResourceName = nameof(CronParser.AccessibleName))]-internal sealed class CronParserGuiTool : IGuiTool-{- private const string DefaultCronWithSeconds = "* * * * * *";- private const string DefaultCronWithoutSeconds = "* * * * *";-- /// <summary>- /// Whether the tool should include seconds in Cron definition- /// </summary>- internal static readonly SettingDefinition<bool> includeSeconds- = new(- name: $"{nameof(CronParserGuiTool)}.{nameof(includeSeconds)}",- defaultValue: true);-- /// <summary>- /// How many lines of next occurrences the tool should generate- /// </summary>- private static readonly SettingDefinition<CronScheduleCount> outputCount- = new(- name: $"{nameof(CronParserGuiTool)}.{nameof(outputCount)}",- defaultValue: CronScheduleCount.Five);-- private enum GridColumn- {- Stretch- }-- private enum GridRow- {- Settings,- Results- }-- private readonly ISettingsProvider _settingsProvider;- private readonly IUISingleLineTextInput _dateFormatText = SingleLineTextInput("cron-parser-date-format");- private readonly IUISingleLineTextInput _cronExpressionText = SingleLineTextInput("cron-parser-cron-expression");- private readonly IUISingleLineTextInput _outputCronDescriptionText = SingleLineTextInput("cron-parser-output-description");- private readonly IUIMultiLineTextInput _outputScheduleText = MultilineTextInput("cron-parser-output-schedule");- private readonly IUIInfoBar _infoBar = InfoBar("cron-parser-info-bar");-- [ImportingConstructor]- public CronParserGuiTool(ISettingsProvider settingsProvider)- {- _settingsProvider = settingsProvider;-- if (_settingsProvider.GetSetting(includeSeconds))- {- _cronExpressionText.Text(DefaultCronWithSeconds);- }- else- {- _cronExpressionText.Text(DefaultCronWithoutSeconds);- }-- _dateFormatText.Text("yyyy-MM-dd ddd HH:mm:ss");-- ParseCronExpression();- }-- public UIToolView View- => new(- isScrollable: true,- Grid()- .ColumnLargeSpacing()- .RowLargeSpacing()- .Rows(- (GridRow.Settings, Auto),- (GridRow.Results, new UIGridLength(1, UIGridUnitType.Fraction)))- .Columns(- (GridColumn.Stretch, new UIGridLength(1, UIGridUnitType.Fraction)))-- .Cells(- Cell(- GridRow.Settings,- GridColumn.Stretch,- Stack()- .Vertical()- .LargeSpacing()- .WithChildren(-- Stack()- .Vertical()- .WithChildren(-- Label().Text(CronParser.ConfigurationTitle),-- Setting()- .Icon("FluentSystemIcons", '\uF18D')- .Title(CronParser.UseSecondsTitle)- .Description(CronParser.UseSecondsDescription)- .Handle(- _settingsProvider,- includeSeconds,- OnSettingChanged),-- Setting()- .Icon("FluentSystemIcons", '\uf7ed')- .Title(CronParser.OutputCountTitle)- .Description(CronParser.OutputCountDescription)- .Handle(- _settingsProvider,- outputCount,- OnSettingChanged,- Item("5", CronScheduleCount.Five),- Item("10", CronScheduleCount.Ten),- Item("25", CronScheduleCount.TwentyFive),- Item("50", CronScheduleCount.Fifty),- Item("100", CronScheduleCount.OneHundred)),-- Setting()- .Icon("FluentSystemIcons", '\uF7E4')- .Title(CronParser.OutputFormatTitle)- .Description(CronParser.OutputFormatDescription)- .InteractiveElement(- _dateFormatText- .HideCommandBar()- .OnTextChanged(OnCronExpressionOrDateFormatChanged))),-- _cronExpressionText- .Title(CronParser.InputTitle)- .CanCopyWhenEditable()- .OnTextChanged(OnCronExpressionOrDateFormatChanged),-- _infoBar- .NonClosable()- .Warning()- .Close(),-- _outputCronDescriptionText- .Title(CronParser.CronDescriptionTitle)- .ReadOnly())),-- Cell(- GridRow.Results,- GridColumn.Stretch,-- _outputScheduleText- .Title(CronParser.OutputScheduleTitle)- .ReadOnly())));-- public void OnDataReceived(string dataTypeName, object? parsedData)- {- }-- private void OnSettingChanged(bool _)- {- OnSettingChanged();- }-- private void OnSettingChanged(CronScheduleCount value)- {- OnSettingChanged();- }-- private void OnCronExpressionOrDateFormatChanged(string _)- {- OnSettingChanged();- }-- private void OnSettingChanged()- {- ParseCronExpression();- }-- private void ParseCronExpression()- {- string cronExpression = _cronExpressionText.Text;- string dateFormat = _dateFormatText.Text;- bool seconds = _settingsProvider.GetSetting(includeSeconds);- int maxScheduleCount = GetOutputCount();-- bool succeeded- = CronHelper.TryGenerateNextSchedulesAndDescription(- cronExpression,- dateFormat,- seconds,- maxScheduleCount,- out string schedule,- out string description,- out string error);-- _outputCronDescriptionText.Text(description);- _outputScheduleText.Text(schedule);-- if (succeeded)- {- _infoBar.Close();- }- else- {- _infoBar.Title(error);- _infoBar.Open();- }- }-- private int GetOutputCount()- {- return _settingsProvider.GetSetting(outputCount) switch- {- CronScheduleCount.Five => 5,- CronScheduleCount.Ten => 10,- CronScheduleCount.TwentyFive => 25,- CronScheduleCount.Fifty => 50,- CronScheduleCount.OneHundred => 100,- _ => throw new NotSupportedException(),- };- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Converters/Date/DateConverter.Designer.cs b/src/app/dev/DevToys.Tools/Tools/Converters/Date/DateConverter.Designer.csdeleted file mode 100644index 2630c163d..000000000--- a/src/app/dev/DevToys.Tools/Tools/Converters/Date/DateConverter.Designer.cs+++ /dev/null@@ -1,423 +0,0 @@-//-------------------------------------------------------------------------------// <auto-generated>-// This code was generated by a tool.-// Runtime Version:4.0.30319.42000-//-// Changes to this file may cause incorrect behavior and will be lost if-// the code is regenerated.-// </auto-generated>-//--------------------------------------------------------------------------------namespace DevToys.Tools.Tools.Converters.Date {- using System;--- /// <summary>- /// A strongly-typed resource class, for looking up localized strings, etc.- /// </summary>- // This class was auto-generated by the StronglyTypedResourceBuilder- // class via a tool like ResGen or Visual Studio.- // To add or remove a member, edit your .ResX file then rerun ResGen- // with the /str option, or rebuild your VS project.- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]- internal class DateConverter {-- private static global::System.Resources.ResourceManager resourceMan;-- private static global::System.Globalization.CultureInfo resourceCulture;-- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]- internal DateConverter() {- }-- /// <summary>- /// Returns the cached ResourceManager instance used by this class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Resources.ResourceManager ResourceManager {- get {- if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Tools.Tools.Converters.Date.DateConverter", typeof(DateConverter).Assembly);- resourceMan = temp;- }- return resourceMan;- }- }-- /// <summary>- /// Overrides the current thread's CurrentUICulture property for all- /// resource lookups using this strongly typed resource class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Globalization.CultureInfo Culture {- get {- return resourceCulture;- }- set {- resourceCulture = value;- }- }-- /// <summary>- /// Looks up a localized string similar to Date converter tool.- /// </summary>- internal static string AccessibleName {- get {- return ResourceManager.GetString("AccessibleName", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Date to convert. Supported format: "ISO 8601" example 2023-11-22T19:58:07.0000000+00:00.- /// </summary>- internal static string DateOptionDescription {- get {- return ResourceManager.GetString("DateOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Daylight saving time..- /// </summary>- internal static string DaylightSavingTime {- get {- return ResourceManager.GetString("DaylightSavingTime", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Day.- /// </summary>- internal static string DayTitle {- get {- return ResourceManager.GetString("DayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Convert date to human-readable date and vice versa.- /// </summary>- internal static string Description {- get {- return ResourceManager.GetString("Description", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to There is no daylight saving time..- /// </summary>- internal static string DisabledDaylightSavingTime {- get {- return ResourceManager.GetString("DisabledDaylightSavingTime", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to DST Ambiguous time..- /// </summary>- internal static string DSTAmbiguousTime {- get {- return ResourceManager.GetString("DSTAmbiguousTime", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Epoch to use. Supported format: "ISO 8601" example 1970-01-01T00:00:00.0000000+00:00.- /// </summary>- internal static string EpochOptionDescription {- get {- return ResourceManager.GetString("EpochOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Use a user defined epoch.- /// </summary>- internal static string EpochSwitchDescription {- get {- return ResourceManager.GetString("EpochSwitchDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Default Epoch.- /// </summary>- internal static string EpochSwitchTitle {- get {- return ResourceManager.GetString("EpochSwitchTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Format to use default Seconds.- /// </summary>- internal static string FormatOptionDescription {- get {- return ResourceManager.GetString("FormatOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Format.- /// </summary>- internal static string FormatTitle {- get {- return ResourceManager.GetString("FormatTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Hour (24 hour).- /// </summary>- internal static string HourTitle {- get {- return ResourceManager.GetString("HourTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Input to convert in long or Date supported format "ISO 8601" example 2023-11-22T19:58:07.0000000+00:00.- /// </summary>- internal static string InputDescription {- get {- return ResourceManager.GetString("InputDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Unable to parse date.- /// </summary>- internal static string InvalidDateTimeCommand {- get {- return ResourceManager.GetString("InvalidDateTimeCommand", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Unable to parse epoch.- /// </summary>- internal static string InvalidEpochCommand {- get {- return ResourceManager.GetString("InvalidEpochCommand", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Unable to find the Timezone Provided please check if the timezone exist here https://learn.microsoft.com/en-us/windows-hardware/manufacture/desktop/default-time-zones?view=windows-11&WT.mc_id=DT-MVP-5001664&source=post_page-----cff0e2b37f52--------------------------------#time-zones.- /// </summary>- internal static string InvalidTimeZoneCommand {- get {- return ResourceManager.GetString("InvalidTimeZoneCommand", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Please specify an input number or date.- /// </summary>- internal static string InvalidValue {- get {- return ResourceManager.GetString("InvalidValue", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Local Date and Time.- /// </summary>- internal static string LocalDateTime {- get {- return ResourceManager.GetString("LocalDateTime", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Date Converter.- /// </summary>- internal static string LongDisplayTitle {- get {- return ResourceManager.GetString("LongDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Milliseconds.- /// </summary>- internal static string Milliseconds {- get {- return ResourceManager.GetString("Milliseconds", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Milliseconds.- /// </summary>- internal static string MillisecondsTitle {- get {- return ResourceManager.GetString("MillisecondsTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Minutes.- /// </summary>- internal static string MinutesTitle {- get {- return ResourceManager.GetString("MinutesTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Month.- /// </summary>- internal static string MonthTitle {- get {- return ResourceManager.GetString("MonthTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to No.- /// </summary>- internal static string No {- get {- return ResourceManager.GetString("No", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Now.- /// </summary>- internal static string Now {- get {- return ResourceManager.GetString("Now", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Offset.- /// </summary>- internal static string OffsetTitle {- get {- return ResourceManager.GetString("OffsetTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Time Date Timezone Epoch Timestamp Ticks.- /// </summary>- internal static string SearchKeywords {- get {- return ResourceManager.GetString("SearchKeywords", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Seconds.- /// </summary>- internal static string Seconds {- get {- return ResourceManager.GetString("Seconds", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Seconds.- /// </summary>- internal static string SecondsTitle {- get {- return ResourceManager.GetString("SecondsTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Date.- /// </summary>- internal static string ShortDisplayTitle {- get {- return ResourceManager.GetString("ShortDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to There is daylight saving time..- /// </summary>- internal static string SupportsDaylightSavingTime {- get {- return ResourceManager.GetString("SupportsDaylightSavingTime", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Ticks.- /// </summary>- internal static string Ticks {- get {- return ResourceManager.GetString("Ticks", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Date.- /// </summary>- internal static string TimestampTitle {- get {- return ResourceManager.GetString("TimestampTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Timezone to use (supported timezones: https://learn.microsoft.com/en-us/windows-hardware/manufacture/desktop/default-time-zones?view=windows-11&WT.mc_id=DT-MVP-5001664&source=post_page-----cff0e2b37f52--------------------------------#time-zones)..- /// </summary>- internal static string TimezoneOptionDescription {- get {- return ResourceManager.GetString("TimezoneOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Time zone.- /// </summary>- internal static string TimeZoneTitle {- get {- return ResourceManager.GetString("TimeZoneTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to UTC Date and Time.- /// </summary>- internal static string UTCDateTime {- get {- return ResourceManager.GetString("UTCDateTime", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to UtcTicks.- /// </summary>- internal static string UtcTicksTitle {- get {- return ResourceManager.GetString("UtcTicksTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Year.- /// </summary>- internal static string YearTitle {- get {- return ResourceManager.GetString("YearTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Yes.- /// </summary>- internal static string Yes {- get {- return ResourceManager.GetString("Yes", resourceCulture);- }- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Converters/Date/DateConverter.resx b/src/app/dev/DevToys.Tools/Tools/Converters/Date/DateConverter.resxdeleted file mode 100644index 06165a85d..000000000--- a/src/app/dev/DevToys.Tools/Tools/Converters/Date/DateConverter.resx+++ /dev/null@@ -1,249 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<root>- <!--- Microsoft ResX Schema-- Version 2.0-- The primary goals of this format is to allow a simple XML format- that is mostly human readable. The generation and parsing of the- various data types are done through the TypeConverter classes- associated with the data types.-- Example:-- ... ado.net/XML headers & schema ...- <resheader name="resmimetype">text/microsoft-resx</resheader>- <resheader name="version">2.0</resheader>- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">- <value>[base64 mime encoded serialized .NET Framework object]</value>- </data>- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>- <comment>This is a comment</comment>- </data>-- There are any number of "resheader" rows that contain simple- name/value pairs.-- Each data row contains a name, and value. The row also contains a- type or mimetype. Type corresponds to a .NET class that support- text/value conversion through the TypeConverter architecture.- Classes that don't support this are serialized and stored with the- mimetype set.-- The mimetype is used for serialized objects, and tells the- ResXResourceReader how to depersist the object. This is currently not- extensible. For a given mimetype the value must be set accordingly:-- Note - application/x-microsoft.net.object.binary.base64 is the format- that the ResXResourceWriter will generate, however the reader can- read any of the formats listed below.-- mimetype: application/x-microsoft.net.object.binary.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.soap.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.bytearray.base64- value : The object must be serialized into a byte array- : using a System.ComponentModel.TypeConverter- : and then encoded with base64 encoding.- -->- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />- <xsd:element name="root" msdata:IsDataSet="true">- <xsd:complexType>- <xsd:choice maxOccurs="unbounded">- <xsd:element name="metadata">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" />- </xsd:sequence>- <xsd:attribute name="name" use="required" type="xsd:string" />- <xsd:attribute name="type" type="xsd:string" />- <xsd:attribute name="mimetype" type="xsd:string" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="assembly">- <xsd:complexType>- <xsd:attribute name="alias" type="xsd:string" />- <xsd:attribute name="name" type="xsd:string" />- </xsd:complexType>- </xsd:element>- <xsd:element name="data">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="resheader">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" />- </xsd:complexType>- </xsd:element>- </xsd:choice>- </xsd:complexType>- </xsd:element>- </xsd:schema>- <resheader name="resmimetype">- <value>text/microsoft-resx</value>- </resheader>- <resheader name="version">- <value>2.0</value>- </resheader>- <resheader name="reader">- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <resheader name="writer">- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <data name="AccessibleName" xml:space="preserve">- <value>Date converter tool</value>- </data>- <data name="DaylightSavingTime" xml:space="preserve">- <value>Daylight saving time.</value>- </data>- <data name="DayTitle" xml:space="preserve">- <value>Day</value>- </data>- <data name="Description" xml:space="preserve">- <value>Convert date to human-readable date and vice versa</value>- </data>- <data name="DisabledDaylightSavingTime" xml:space="preserve">- <value>There is no daylight saving time.</value>- </data>- <data name="DSTAmbiguousTime" xml:space="preserve">- <value>DST Ambiguous time.</value>- </data>- <data name="HourTitle" xml:space="preserve">- <value>Hour (24 hour)</value>- </data>- <data name="TimeZoneTitle" xml:space="preserve">- <value>Time zone</value>- </data>- <data name="LocalDateTime" xml:space="preserve">- <value>Local Date and Time</value>- </data>- <data name="MinutesTitle" xml:space="preserve">- <value>Minutes</value>- </data>- <data name="MonthTitle" xml:space="preserve">- <value>Month</value>- </data>- <data name="OffsetTitle" xml:space="preserve">- <value>Offset</value>- </data>- <data name="SearchKeywords" xml:space="preserve">- <value>Time Date Timezone Epoch Timestamp Ticks</value>- <comment>Alternative search keywords. Enables searching for words that are not included in Description, MenuDisplayName, and SearchDisplayName.</comment>- </data>- <data name="SecondsTitle" xml:space="preserve">- <value>Seconds</value>- </data>- <data name="SupportsDaylightSavingTime" xml:space="preserve">- <value>There is daylight saving time.</value>- </data>- <data name="TimestampTitle" xml:space="preserve">- <value>Date</value>- </data>- <data name="UTCDateTime" xml:space="preserve">- <value>UTC Date and Time</value>- </data>- <data name="UtcTicksTitle" xml:space="preserve">- <value>UtcTicks</value>- </data>- <data name="YearTitle" xml:space="preserve">- <value>Year</value>- </data>- <data name="Now" xml:space="preserve">- <value>Now</value>- </data>- <data name="LongDisplayTitle" xml:space="preserve">- <value>Date Converter</value>- </data>- <data name="ShortDisplayTitle" xml:space="preserve">- <value>Date</value>- </data>- <data name="EpochSwitchTitle" xml:space="preserve">- <value>Default Epoch</value>- </data>- <data name="EpochSwitchDescription" xml:space="preserve">- <value>Use a user defined epoch</value>- </data>- <data name="No" xml:space="preserve">- <value>No</value>- </data>- <data name="Yes" xml:space="preserve">- <value>Yes</value>- </data>- <data name="MillisecondsTitle" xml:space="preserve">- <value>Milliseconds</value>- </data>- <data name="FormatTitle" xml:space="preserve">- <value>Format</value>- </data>- <data name="Ticks" xml:space="preserve">- <value>Ticks</value>- </data>- <data name="Seconds" xml:space="preserve">- <value>Seconds</value>- </data>- <data name="Milliseconds" xml:space="preserve">- <value>Milliseconds</value>- </data>- <data name="DateOptionDescription" xml:space="preserve">- <value>Date to convert. Supported format: "ISO 8601" example 2023-11-22T19:58:07.0000000+00:00</value>- <comment>CLI parameter description</comment>- </data>- <data name="EpochOptionDescription" xml:space="preserve">- <value>Epoch to use. Supported format: "ISO 8601" example 1970-01-01T00:00:00.0000000+00:00</value>- <comment>CLI parameter description</comment>- </data>- <data name="FormatOptionDescription" xml:space="preserve">- <value>Format to use default Seconds</value>- <comment>CLI parameter description</comment>- </data>- <data name="InputDescription" xml:space="preserve">- <value>Input to convert in long or Date supported format "ISO 8601" example 2023-11-22T19:58:07.0000000+00:00</value>- <comment>CLI parameter description</comment>- </data>- <data name="TimezoneOptionDescription" xml:space="preserve">- <value>Timezone to use (supported timezones: https://learn.microsoft.com/en-us/windows-hardware/manufacture/desktop/default-time-zones?view=windows-11&WT.mc_id=DT-MVP-5001664&source=post_page-----cff0e2b37f52--------------------------------#time-zones).</value>- <comment>CLI parameter description</comment>- </data>- <data name="InvalidDateTimeCommand" xml:space="preserve">- <value>Unable to parse date</value>- <comment>CLI error message</comment>- </data>- <data name="InvalidEpochCommand" xml:space="preserve">- <value>Unable to parse epoch</value>- <comment>CLI error message</comment>- </data>- <data name="InvalidTimeZoneCommand" xml:space="preserve">- <value>Unable to find the Timezone Provided please check if the timezone exist here https://learn.microsoft.com/en-us/windows-hardware/manufacture/desktop/default-time-zones?view=windows-11&WT.mc_id=DT-MVP-5001664&source=post_page-----cff0e2b37f52--------------------------------#time-zones</value>- <comment>CLI error message</comment>- </data>- <data name="InvalidValue" xml:space="preserve">- <value>Please specify an input number or date</value>- </data>-</root>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/Converters/Date/DateConverterCommandLineTool.cs b/src/app/dev/DevToys.Tools/Tools/Converters/Date/DateConverterCommandLineTool.csdeleted file mode 100644index bf96c6171..000000000--- a/src/app/dev/DevToys.Tools/Tools/Converters/Date/DateConverterCommandLineTool.cs+++ /dev/null@@ -1,160 +0,0 @@-using System.Globalization;-using DevToys.Tools.Helpers;-using DevToys.Tools.Models;-using Microsoft.Extensions.Logging;-using OneOf;--namespace DevToys.Tools.Tools.Converters.Date;--[Export(typeof(ICommandLineTool))]-[Name("DateConverter")]-[CommandName(- Name = "date",- ResourceManagerBaseName = "DevToys.Tools.Tools.Converters.Date.DateConverter",- DescriptionResourceName = nameof(DateConverter.Description))]-internal sealed class DateConverterCommandLineTool : ICommandLineTool-{- [CommandLineOption(- Name = "input",- Alias = "i",- IsRequired = true,- DescriptionResourceName = nameof(DateConverter.InputDescription))]- internal OneOf<long, string>? Input { get; set; }-- [CommandLineOption(- Name = "epoch",- Alias = "e",- DescriptionResourceName = nameof(DateConverter.EpochOptionDescription))]-- internal string? EpochOption { get; set; }-- [CommandLineOption(- Name = "timezone",- Alias = "tz",- DescriptionResourceName = nameof(DateConverter.TimezoneOptionDescription))]- internal string? TimeZoneOption { get; set; }-- [CommandLineOption(- Name = "format",- Alias = "f",- DescriptionResourceName = nameof(DateConverter.FormatOptionDescription))]- internal DateFormat FormatOption { get; set; } = DateFormat.Seconds;-- public ValueTask<int> InvokeAsync(ILogger logger, CancellationToken cancellationToken)- {- if (!Input.HasValue)- {- Console.Error.WriteLine(DateConverter.InvalidValue);- return ValueTask.FromResult(-1);- }-- return Input.Value.Match(- inputNumber => InvokeNumberConvert(- inputNumber,- EpochOption,- FormatOption,- cancellationToken),- inputDate => InvokeDateConvert(- inputDate,- EpochOption,- FormatOption,- cancellationToken)- );- }-- private static ValueTask<int> InvokeDateConvert(- string dateOption,- string? epochOption,- DateFormat formatOption,- CancellationToken cancellationToken)- {- if (string.IsNullOrWhiteSpace(dateOption))- {- Console.Error.WriteLine(DateConverter.InvalidValue);- return ValueTask.FromResult(-1);- }-- if (TryParseDate(dateOption, out DateTimeOffset dateTimeOffset) != 0)- {- Console.Error.WriteLine(DateConverter.InvalidDateTimeCommand);- return ValueTask.FromResult(-1);- }-- DateTimeOffset epoch = DateTime.UnixEpoch;- if (!string.IsNullOrWhiteSpace(epochOption) && TryParseDate(epochOption, out epoch) != 0)- {- Console.Error.WriteLine(DateConverter.InvalidEpochCommand);- return ValueTask.FromResult(-1);- }-- ResultInfo<long> result = DateHelper.ConvertToLong(- dateTimeOffset,- epoch,- formatOption);-- cancellationToken.ThrowIfCancellationRequested();-- if (!result.HasSucceeded)- {- Console.Error.WriteLine(result.Data);- return ValueTask.FromResult(-1);- }-- Console.WriteLine(result.Data);- return ValueTask.FromResult(0);- }-- private ValueTask<int> InvokeNumberConvert(- long numberOption,- string? epochOption,- DateFormat formatOption,- CancellationToken cancellationToken)- {- DateTimeOffset epoch = DateTime.UnixEpoch;- if (!string.IsNullOrWhiteSpace(epochOption) && TryParseDate(epochOption, out epoch) != 0)- {- Console.Error.WriteLine(DateConverter.InvalidEpochCommand);- return ValueTask.FromResult(-1);- }-- ResultInfo<DateTimeOffset> result = DateHelper.ConvertToDateTimeUtc(- numberOption,- epoch,- formatOption);-- cancellationToken.ThrowIfCancellationRequested();-- if (!result.HasSucceeded)- {- Console.Error.WriteLine(result.Data);- return ValueTask.FromResult(-1);- }-- TimeZoneInfo timeZone = TimeZoneInfo.Local;- if (!string.IsNullOrWhiteSpace(TimeZoneOption))- {- try- {- timeZone = TimeZoneInfo.FindSystemTimeZoneById(TimeZoneOption);- }- catch (TimeZoneNotFoundException)- {- Console.Error.WriteLine(DateConverter.InvalidTimeZoneCommand);- return ValueTask.FromResult(-1);- }- }-- DateTimeOffset convertedDateTime = TimeZoneInfo.ConvertTime(result.Data, timeZone);- Console.WriteLine(convertedDateTime.ToString("O"));- return ValueTask.FromResult(0);- }-- private static int TryParseDate(string dateTime, out DateTimeOffset dateTimeOffset)- {- if (DateTimeOffset.TryParseExact(dateTime, "O", null, DateTimeStyles.None, out dateTimeOffset))- {- return 0;- }- return -1;- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Converters/Date/DateConverterGuiTool.cs b/src/app/dev/DevToys.Tools/Tools/Converters/Date/DateConverterGuiTool.csdeleted file mode 100644index a60732d61..000000000--- a/src/app/dev/DevToys.Tools/Tools/Converters/Date/DateConverterGuiTool.cs+++ /dev/null@@ -1,1055 +0,0 @@-using System.Collections.ObjectModel;-using System.Text.RegularExpressions;-using DevToys.Tools.Helpers;-using DevToys.Tools.Models;-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.Tools.Converters.Date;--[Export(typeof(IGuiTool))]-[Name("DateConverter")]-[ToolDisplayInformation(- IconFontName = "FluentSystemIcons",- IconGlyph = '\uE250',- GroupName = PredefinedCommonToolGroupNames.Converters,- ResourceManagerAssemblyIdentifier = nameof(DevToysToolsResourceManagerAssemblyIdentifier),- ResourceManagerBaseName = "DevToys.Tools.Tools.Converters.Date.DateConverter",- ShortDisplayTitleResourceName = nameof(DateConverter.ShortDisplayTitle),- LongDisplayTitleResourceName = nameof(DateConverter.LongDisplayTitle),- DescriptionResourceName = nameof(DateConverter.Description),- SearchKeywordsResourceName = nameof(DateConverter.SearchKeywords),- AccessibleNameResourceName = nameof(DateConverter.AccessibleName))]-[AcceptedDataTypeName(PredefinedCommonDataTypeNames.Date)]-internal sealed partial class DateConverterGuiTool : IGuiTool, IDisposable-{- /// <summary>- /// Whether the tool should use the custom Epoch.- /// </summary>- private static readonly SettingDefinition<bool> useCustomEpochSettings- = new(- name: $"{nameof(DateConverterGuiTool)}.{nameof(useCustomEpochSettings)}",- defaultValue: false);-- /// <summary>- /// The Epoch to use.- /// </summary>- private static readonly SettingDefinition<DateTimeOffset> customEpochSettings- = new(- name: $"{nameof(DateConverterGuiTool)}.{nameof(customEpochSettings)}",- defaultValue: DateTime.UnixEpoch);-- /// <summary>- /// The DateTime to use.- /// </summary>- private static readonly SettingDefinition<DateTimeOffset> currentTimeSettings- = new(- name: $"{nameof(DateConverterGuiTool)}.{nameof(currentTimeSettings)}",- defaultValue: DateTime.UtcNow);-- /// <summary>- /// The timeZone to use.- /// </summary>- private static readonly SettingDefinition<string> timeZoneIdSettings- = new(- name: $"{nameof(DateConverterGuiTool)}.{nameof(timeZoneIdSettings)}",- defaultValue: TimeZoneInfo.Local.Id);-- /// <summary>- /// The Format to use.- /// </summary>- private static readonly SettingDefinition<DateFormat> formatSettings- = new(- name: $"{nameof(DateConverterGuiTool)}.{nameof(formatSettings)}",- defaultValue: DateFormat.Seconds);-- private bool _ignoreInputTextChange;-- private readonly ILogger _logger;-- private readonly DisposableSemaphore _semaphore = new();-- private readonly ISettingsProvider _settingsProvider;-- private IUIDropDownListItem SelectedTimeZoneDropDownItem- {- get- {- TimeZoneInfo timeZoneInfo = GetSelectedTimeZone();- if (timeZoneInfo is null)- {- return Item(FormatTimeZone(TimeZoneInfo.Local), TimeZoneInfo.Local.Id);- }- return Item(FormatTimeZone(timeZoneInfo), timeZoneInfo.Id);- }- set- {- _settingsProvider.SetSetting(timeZoneIdSettings, value.Value!.ToString() ?? string.Empty);- }- }-- private readonly IUIInfoBar _errorInfoBar = InfoBar("date-converter-error-info-bar");-- private readonly IUINumberInput _numberInputText = NumberInput("date-converter-number-input");-- private readonly IUISelectDropDownList _selectTimeZoneList = SelectDropDownList("date-converter-timezone-dropdown");-- private readonly IUISettingGroup _customEpochSetting = SettingGroup("date-converter-custom-epoch-setting");-- #region EpochUiInputs- private readonly IUIStack _epochStack = Stack("date-converter-epoch-stack");- private readonly IUISwitch _useCustomEpochSwitch = Switch("date-converter-use-custom-epoch-switch");- private readonly IUINumberInput _epochYearInputNumber = NumberInput("date-converter-epoch-input-year");- private readonly IUINumberInput _epochMonthInputNumber = NumberInput("date-converter-epoch-input-month");- private readonly IUINumberInput _epochDayInputNumber = NumberInput("date-converter-epoch-input-day");- private readonly IUINumberInput _epochHourInputNumber = NumberInput("date-converter-epoch-input-hour");- private readonly IUINumberInput _epochMinuteInputNumber = NumberInput("date-converter-epoch-input-minute");- private readonly IUINumberInput _epochSecondsInputNumber = NumberInput("date-converter-epoch-input-second");- private readonly IUINumberInput _epochMillisecondsInputNumber = NumberInput("date-converter-epoch-input-millisecond");- #endregion-- #region DateTimeUiInputs- private readonly IUINumberInput _dateYearInputNumber = NumberInput("date-converter-input-time-year");- private readonly IUINumberInput _dateMonthInputNumber = NumberInput("date-converter-input-time-month");- private readonly IUINumberInput _dateDayInputNumber = NumberInput("date-converter-input-time-day");- private readonly IUINumberInput _dateHourInputNumber = NumberInput("date-converter-input-time-hour");- private readonly IUINumberInput _dateMinuteInputNumber = NumberInput("date-converter-input-time-minute");- private readonly IUINumberInput _dateSecondsInputNumber = NumberInput("date-converter-input-time-second");- private readonly IUINumberInput _dateMillisecondsInputNumber = NumberInput("date-converter-input-time-millisecond");- #endregion-- #region DstInformation-- private readonly IUILabel _dstDaylightSavingLabel = Label("date-converter-dst-daylight-label").Style(UILabelStyle.Body);- private readonly IUILabel _dstOffsetLabel = Label("date-converter-dst-offset-label").Style(UILabelStyle.Body);- private readonly IUILabel _dstTicksLabel = Label("date-converter-dst-ticks-label").Style(UILabelStyle.Body);- private readonly IUILabel _dstLocalDateTimeLabel = Label("date-converter-dst-local-dateTime-label").Style(UILabelStyle.Body);- private readonly IUILabel _dstUtcDateTimeLabel = Label("date-converter-dst-utc-dateTime-label").Style(UILabelStyle.Body);-- #endregion-- private CancellationTokenSource? _cancellationTokenSource;-- [ImportingConstructor]- public DateConverterGuiTool(ISettingsProvider settingsProvider)- {- _logger = this.Log();- _settingsProvider = settingsProvider;-- switch (_settingsProvider.GetSetting(useCustomEpochSettings))- {- case true:- _useCustomEpochSwitch.On();- DateTimeOffset epoch = _settingsProvider.GetSetting(customEpochSettings);- PopulateEpoch(epoch);- _epochStack.Enable();- break;-- case false:- _useCustomEpochSwitch.Off();- _epochStack.Disable();- break;-- default:- throw new NotSupportedException();- }-- DateTimeOffset date = _settingsProvider.GetSetting(currentTimeSettings);- PopulateDate(date);- }-- internal Task? WorkTask { get; private set; }-- public UIToolView View- => new(- isScrollable: true,- Grid()- .ColumnLargeSpacing()- .RowLargeSpacing()- .Rows(- (DateConverterGridRow.Header, Auto),- (DateConverterGridRow.Content, new UIGridLength(1, UIGridUnitType.Fraction))- )- .Columns(- (DateConverterGridColumn.Content, new UIGridLength(1, UIGridUnitType.Fraction))- )- .Cells(- Cell(- DateConverterGridRow.Header,- DateConverterGridColumn.Content,- Stack()- .Vertical()- .SmallSpacing()- .WithChildren(- _errorInfoBar- .Error()- .Close(),- EpochSettingsViewComponent(),- Setting("date-converter-timezone-setting")- .Icon("FluentSystemIcons", '\uE36E')- .Title(DateConverter.TimeZoneTitle)- .InteractiveElement(- _selectTimeZoneList- .Select(SelectedTimeZoneDropDownItem)- .WithItems(BuildTimeZoneItems())- .OnItemSelected(OnTimeZoneSelected)- ),- Setting("date-converter-format-setting")- .Icon("FluentSystemIcons", '\uF6F8')- .Title(DateConverter.FormatTitle)- .Handle(- _settingsProvider,- formatSettings,- OnFormatChanged,- Item(DateConverter.Ticks, DateFormat.Ticks),- Item(DateConverter.Seconds, DateFormat.Seconds),- Item(DateConverter.Milliseconds, DateFormat.Milliseconds)- )- )- ),- Cell(- DateConverterGridRow.Content,- DateConverterGridColumn.Content,- Stack()- .Vertical()- .SmallSpacing()- .WithChildren(- DstInformation(),- _numberInputText- .Title(DateConverter.TimestampTitle)- .OnTextChanged(OnTimeStampChanged)- .Step(1)- .Minimum(-2177452704000000)- // Ticks max value- .Maximum(3155861951990000000),- DateTimeStack()- )- )- )- );-- // Smart detection handler.- public void OnDataReceived(string dataTypeName, object? parsedData)- {- if (dataTypeName == PredefinedCommonDataTypeNames.Date &&- parsedData is DateTimeOffset dateStrongTypedParsedData)- {- PopulateDate(dateStrongTypedParsedData);- }- }-- public void Dispose()- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _semaphore.Dispose();- }-- private void OnTimeZoneSelected(IUIDropDownListItem? item)- {- if (item is null || item.Value is null)- {- return;- }-- if (_ignoreInputTextChange)- {- return;- }-- SelectedTimeZoneDropDownItem = item;- DateTimeOffset currentTime = _settingsProvider.GetSetting(DateConverterGuiTool.currentTimeSettings);- StartDateTimeConvert(currentTime);- }-- private void OnFormatChanged(DateFormat format)- {- _settingsProvider.SetSetting(DateConverterGuiTool.formatSettings, format);- if (format is not DateFormat.Seconds)- {- _dateMillisecondsInputNumber.Editable();- }- else- {- _dateMillisecondsInputNumber.ReadOnly();- }-- DateTimeOffset currentTime = _settingsProvider.GetSetting(DateConverterGuiTool.currentTimeSettings);- StartDateTimeConvert(currentTime);- }-- private void OnCustomEpochChanged(bool useCustomEpoch)- {- _settingsProvider.SetSetting(DateConverterGuiTool.useCustomEpochSettings, useCustomEpoch);- DateTimeOffset currentTime = _settingsProvider.GetSetting(DateConverterGuiTool.currentTimeSettings);- if (useCustomEpoch)- {- _epochStack.Enable();- }- else- {- _epochStack.Disable();- }-- StartDateTimeConvert(currentTime);- }-- private void OnTimeChanged(string value, DateValueType valueChanged)- {- if (_ignoreInputTextChange)- {- return;- }-- TimeZoneInfo timeZoneInfo = GetSelectedTimeZone();- DateTimeOffset currentTime = _settingsProvider.GetSetting(DateConverterGuiTool.currentTimeSettings);-- ResultInfo<DateTimeOffset> result = DateHelper.ChangeDateTime(- Convert.ToInt32(value),- currentTime,- timeZoneInfo,- valueChanged);- if (!result.HasSucceeded)- {- _errorInfoBar.Description(DateConverter.InvalidValue);- _errorInfoBar.Open();- return;- }-- _errorInfoBar.Close();- _settingsProvider.SetSetting(DateConverterGuiTool.currentTimeSettings, result.Data);- StartDateTimeConvert(result.Data);- }-- private void OnEpochChanged(string value, DateValueType valueChanged)- {- if (_ignoreInputTextChange)- {- return;- }-- DateTimeOffset epochToUse = _settingsProvider.GetSetting(DateConverterGuiTool.customEpochSettings);-- ResultInfo<DateTimeOffset> result = DateHelper.ChangeDateTime(- Convert.ToInt32(value),- epochToUse,- TimeZoneInfo.Utc,- valueChanged);-- if (!result.HasSucceeded)- {- _errorInfoBar.Description(DateConverter.InvalidValue);- _errorInfoBar.Open();- return;- }-- _errorInfoBar.Close();- _settingsProvider.SetSetting(DateConverterGuiTool.customEpochSettings, result.Data);-- if (!_settingsProvider.GetSetting(useCustomEpochSettings))- {- return;- }-- DateTimeOffset currentTime = _settingsProvider.GetSetting(DateConverterGuiTool.currentTimeSettings);- StartDateTimeConvert(currentTime);- }-- private void OnTimeStampChanged(string value)- {- if (_ignoreInputTextChange)- {- return;- }-- if (string.IsNullOrEmpty(value))- {- _errorInfoBar.Description(DateConverter.InvalidValue);- _errorInfoBar.Open();- return;- }-- // need to convert to double first to have a proper format- // the input is a double could be nice to allow a custom format like double / long / ...- if (!double.TryParse(value, out double number))- {- _errorInfoBar.Description(DateConverter.InvalidValue);- _errorInfoBar.Open();- return;- }-- _errorInfoBar.Close();-- bool useCustomEpoch = _settingsProvider.GetSetting(DateConverterGuiTool.useCustomEpochSettings);- DateFormat format = _settingsProvider.GetSetting(DateConverterGuiTool.formatSettings);- TimeZoneInfo timeZoneInfo = GetSelectedTimeZone();- DateTimeOffset epochToUse = DateTime.UnixEpoch;- if (useCustomEpoch)- {- epochToUse = _settingsProvider.GetSetting(DateConverterGuiTool.customEpochSettings);- }-- StartNumberConvert(Convert.ToInt64(number), epochToUse, timeZoneInfo, format);- }-- private void StartNumberConvert(- long number,- DateTimeOffset epoch,- TimeZoneInfo timeZone,- DateFormat dateFormat)- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _cancellationTokenSource = new CancellationTokenSource();-- _ignoreInputTextChange = true;- WorkTask = ConvertNumberAsync(- number,- epoch,- timeZone,- dateFormat,- _cancellationTokenSource.Token);- _ignoreInputTextChange = false;- }-- private async Task ConvertNumberAsync(- long number,- DateTimeOffset epoch,- TimeZoneInfo timeZone,- DateFormat selectedFormat,- CancellationToken cancellationToken)- {- using (await _semaphore.WaitAsync(cancellationToken))- {- ResultInfo<DateTimeOffset> result = DateHelper.ConvertToDateTimeUtc(- number,- epoch,- selectedFormat);-- DateTimeOffset convertedDateTime = TimeZoneInfo.ConvertTime(result.Data, timeZone);- PopulateDate(convertedDateTime);- _numberInputText.Text(number.ToString());-- _settingsProvider.SetSetting(currentTimeSettings, convertedDateTime);-- ComputeDstInformation(convertedDateTime, timeZone);- }- }-- private void StartDateTimeConvert(DateTimeOffset dateTimeOffset)- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _cancellationTokenSource = new CancellationTokenSource();-- bool useCustomEpoch = _settingsProvider.GetSetting(DateConverterGuiTool.useCustomEpochSettings);- DateFormat format = _settingsProvider.GetSetting(DateConverterGuiTool.formatSettings);- TimeZoneInfo timeZoneInfo = GetSelectedTimeZone();- DateTimeOffset epochToUse = DateTime.UnixEpoch;- if (useCustomEpoch)- {- epochToUse = _settingsProvider.GetSetting(DateConverterGuiTool.customEpochSettings);- }-- _ignoreInputTextChange = true;- WorkTask = ConvertDateTimeOffsetAsync(- dateTimeOffset,- epochToUse,- timeZoneInfo,- format,- _cancellationTokenSource.Token);- _ignoreInputTextChange = false;- }-- private async Task ConvertDateTimeOffsetAsync(- DateTimeOffset dateTimeOffset,- DateTimeOffset epoch,- TimeZoneInfo timeZone,- DateFormat selectedFormat,- CancellationToken cancellationToken)- {- using (await _semaphore.WaitAsync(cancellationToken))- {- ResultInfo<long> result = DateHelper.ConvertToLong(- dateTimeOffset,- epoch,- selectedFormat);-- _numberInputText.Text(result.Data.ToString());- DateTimeOffset convertedDateTime = TimeZoneInfo.ConvertTime(dateTimeOffset, timeZone);- PopulateDate(convertedDateTime);- ComputeDstInformation(convertedDateTime, timeZone);- }- }-- private TimeZoneInfo GetSelectedTimeZone()- {- string timeZoneId = _settingsProvider.GetSetting(timeZoneIdSettings);- return TimeZoneInfo.FindSystemTimeZoneById(timeZoneId);- }-- private IUISettingGroup EpochSettingsViewComponent()- {- return- _customEpochSetting- .Icon("FluentSystemIcons", '\uE250')- .Title(DateConverter.EpochSwitchTitle)- .Description(DateConverter.EpochSwitchDescription)- .InteractiveElement(- _useCustomEpochSwitch- .OnText(DateConverter.Yes)- .OffText(DateConverter.No)- .OnToggle(OnCustomEpochChanged)- )- .WithChildren(- EpochTimeStack()- );- }-- private IUIStack EpochTimeStack()- {- return _epochStack- .Vertical()- .WithChildren(- Grid("epoch-date-grid")- .RowSmallSpacing()- .ColumnSmallSpacing()- .Rows(- (DateConverterGridDateRow.Content, Auto)- )- .Columns(- (DateConverterGridDateColumn.Year, new UIGridLength(1, UIGridUnitType.Fraction)),- (DateConverterGridDateColumn.Month, new UIGridLength(1, UIGridUnitType.Fraction)),- (DateConverterGridDateColumn.Day, new UIGridLength(1, UIGridUnitType.Fraction))- )- .Cells(- Cell(- DateConverterGridRow.Header,- DateConverterGridDateColumn.Year,- Stack()- .Vertical()- .SmallSpacing()- .WithChildren(- _epochYearInputNumber- .Title(DateConverter.YearTitle)- .HideCommandBar()- .OnTextChanged((value) =>- {- OnEpochChanged(value, DateValueType.Year);- })- .Minimum(0)- .Maximum(9999)- )- ),- Cell(- DateConverterGridRow.Header,- DateConverterGridDateColumn.Month,- Stack()- .Vertical()- .SmallSpacing()- .WithChildren(- _epochMonthInputNumber- .Title(DateConverter.MonthTitle)- .HideCommandBar()- .OnTextChanged((value) =>- {- OnEpochChanged(value, DateValueType.Month);- })- .Minimum(1)- .Maximum(12)- )- ),- Cell(- DateConverterGridRow.Header,- DateConverterGridDateColumn.Day,- Stack()- .Vertical()- .SmallSpacing()- .WithChildren(- _epochDayInputNumber- .Title(DateConverter.DayTitle)- .HideCommandBar()- .OnTextChanged((value) =>- {- OnEpochChanged(value, DateValueType.Day);- })- .Minimum(1)- .Maximum(31)- )- )- ),- Grid("epoch-time-grid")- .RowSmallSpacing()- .ColumnSmallSpacing()- .Rows(- (DateConverterGridDateRow.Content, Auto)- )- .Columns(- (DateConverterGridTimeColumn.Hour, new UIGridLength(1, UIGridUnitType.Fraction)),- (DateConverterGridTimeColumn.Minutes, new UIGridLength(1, UIGridUnitType.Fraction)),- (DateConverterGridTimeColumn.Seconds, new UIGridLength(1, UIGridUnitType.Fraction)),- (DateConverterGridTimeColumn.Milliseconds, new UIGridLength(1, UIGridUnitType.Fraction))- )- .Cells(- Cell(- DateConverterGridRow.Header,- DateConverterGridTimeColumn.Hour,- Stack()- .Vertical()- .SmallSpacing()- .WithChildren(- _epochHourInputNumber- .Title(DateConverter.HourTitle)- .HideCommandBar()- .OnTextChanged((value) =>- {- OnEpochChanged(value, DateValueType.Hour);- })- .Minimum(0)- .Maximum(24)- )- ),- Cell(- DateConverterGridRow.Header,- DateConverterGridTimeColumn.Minutes,- Stack()- .Vertical()- .SmallSpacing()- .WithChildren(- _epochMinuteInputNumber- .Title(DateConverter.MinutesTitle)- .HideCommandBar()- .OnTextChanged((value) =>- {- OnEpochChanged(value, DateValueType.Minute);- })- .Minimum(0)- .Maximum(59)- )- ),- Cell(- DateConverterGridRow.Header,- DateConverterGridTimeColumn.Seconds,- Stack()- .Vertical()- .SmallSpacing()- .WithChildren(- _epochSecondsInputNumber- .Title(DateConverter.SecondsTitle)- .HideCommandBar()- .OnTextChanged((value) =>- {- OnEpochChanged(value, DateValueType.Second);- })- .Minimum(0)- .Maximum(59)- )- ),- Cell(- DateConverterGridRow.Header,- DateConverterGridTimeColumn.Milliseconds,- Stack()- .Vertical()- .SmallSpacing()- .WithChildren(- _epochMillisecondsInputNumber- .Title(DateConverter.MillisecondsTitle)- .HideCommandBar()- .OnTextChanged((value) =>- {- OnEpochChanged(value, DateValueType.Millisecond);- })- .Minimum(0)- .Maximum(999)- )- )- )- );- }-- private IUIStack DateTimeStack()- {- return- Stack()- .Vertical()- .WithChildren(- Grid("dateTime-date-grid")- .RowSmallSpacing()- .ColumnSmallSpacing()- .Rows(- (DateConverterGridDateRow.Content, Auto)- )- .Columns(- (DateConverterGridDateColumn.Year, new UIGridLength(1, UIGridUnitType.Fraction)),- (DateConverterGridDateColumn.Month, new UIGridLength(1, UIGridUnitType.Fraction)),- (DateConverterGridDateColumn.Day, new UIGridLength(1, UIGridUnitType.Fraction))- )- .Cells(- Cell(- DateConverterGridRow.Header,- DateConverterGridDateColumn.Year,- Stack()- .Vertical()- .SmallSpacing()- .WithChildren(- _dateYearInputNumber- .Title(DateConverter.YearTitle)- .HideCommandBar()- .OnTextChanged((value) =>- {- OnTimeChanged(value, DateValueType.Year);- })- .Step(1)- .Minimum(1)- .Maximum(9999)- )- ),- Cell(- DateConverterGridRow.Header,- DateConverterGridDateColumn.Month,- Stack()- .Vertical()- .SmallSpacing()- .WithChildren(- _dateMonthInputNumber- .Title(DateConverter.MonthTitle)- .HideCommandBar()- .OnTextChanged((value) =>- {- OnTimeChanged(value, DateValueType.Month);- })- .Step(1)- .Minimum(0)- .Maximum(13)- )- ),- Cell(- DateConverterGridRow.Header,- DateConverterGridDateColumn.Day,- Stack()- .Vertical()- .SmallSpacing()- .WithChildren(- _dateDayInputNumber- .Title(DateConverter.DayTitle)- .HideCommandBar()- .OnTextChanged((value) =>- {- OnTimeChanged(value, DateValueType.Day);- })- .Step(1)- .Minimum(-1)- .Maximum(32)- )- )- ),- Grid("dateTime-time-grid")- .RowSmallSpacing()- .ColumnSmallSpacing()- .Rows(- (DateConverterGridDateRow.Content, Auto)- )- .Columns(- (DateConverterGridTimeColumn.Hour, new UIGridLength(1, UIGridUnitType.Fraction)),- (DateConverterGridTimeColumn.Minutes, new UIGridLength(1, UIGridUnitType.Fraction)),- (DateConverterGridTimeColumn.Seconds, new UIGridLength(1, UIGridUnitType.Fraction)),- (DateConverterGridTimeColumn.Milliseconds, new UIGridLength(1, UIGridUnitType.Fraction))- )- .Cells(- Cell(- DateConverterGridRow.Header,- DateConverterGridTimeColumn.Hour,- Stack()- .Vertical()- .SmallSpacing()- .WithChildren(- _dateHourInputNumber- .Title(DateConverter.HourTitle)- .HideCommandBar()- .OnTextChanged((value) =>- {- OnTimeChanged(value, DateValueType.Hour);- })- .Step(1)- .Minimum(-1)- .Maximum(24)- )- ),- Cell(- DateConverterGridRow.Header,- DateConverterGridTimeColumn.Minutes,- Stack()- .Vertical()- .SmallSpacing()- .WithChildren(- _dateMinuteInputNumber- .Title(DateConverter.MinutesTitle)- .HideCommandBar()- .OnTextChanged((value) =>- {- OnTimeChanged(value, DateValueType.Minute);- })- .Step(1)- .Minimum(-1)- .Maximum(60)- )- ),- Cell(- DateConverterGridRow.Header,- DateConverterGridTimeColumn.Seconds,- Stack()- .Vertical()- .SmallSpacing()- .WithChildren(- _dateSecondsInputNumber- .Title(DateConverter.SecondsTitle)- .HideCommandBar()- .OnTextChanged((value) =>- {- OnTimeChanged(value, DateValueType.Second);- })- .Step(1)- .Minimum(-1)- .Maximum(60)- )- ),- Cell(- DateConverterGridRow.Header,- DateConverterGridTimeColumn.Milliseconds,- Stack()- .Vertical()- .SmallSpacing()- .WithChildren(- _dateMillisecondsInputNumber- .Title(DateConverter.MillisecondsTitle)- .HideCommandBar()- .OnTextChanged((value) =>- {- OnTimeChanged(value, DateValueType.Millisecond);- })- .Step(1)- .Minimum(-1)- .Maximum(1001)- )- )- ));- }-- private IUICard DstInformation()- {- return- Card(- Stack()- .Vertical()- .WithChildren(- Grid()- .Rows(- (DateConvertDstGridRow.Daylight, Auto),- (DateConvertDstGridRow.Offset, Auto),- (DateConvertDstGridRow.DateTime, Auto)- )- .Columns(- (DateConvertDstGridColumn.LeftTitle, new UIGridLength(1, UIGridUnitType.Fraction)),- (DateConvertDstGridColumn.LeftContent, new UIGridLength(1, UIGridUnitType.Fraction)),- (DateConvertDstGridColumn.RightTitle, new UIGridLength(1, UIGridUnitType.Fraction)),- (DateConvertDstGridColumn.RightContent, new UIGridLength(1, UIGridUnitType.Fraction))- )- .Cells(- Cell(- DateConvertDstGridRow.Daylight,- DateConvertDstGridColumn.LeftTitle,- Stack()- .Vertical()- .SmallSpacing()- .WithChildren(- _dstDaylightSavingLabel- )- ),- Cell(- DateConvertDstGridRow.Offset,- DateConvertDstGridColumn.LeftTitle,- Stack()- .Vertical()- .SmallSpacing()- .WithChildren(- Label()- .Style(UILabelStyle.Body)- .Text(DateConverter.OffsetTitle)- )- ),- Cell(- DateConvertDstGridRow.Offset,- DateConvertDstGridColumn.LeftContent,- Stack()- .Vertical()- .SmallSpacing()- .WithChildren(- _dstOffsetLabel- )- ),- Cell(- DateConvertDstGridRow.Offset,- DateConvertDstGridColumn.RightTitle,- Stack()- .Vertical()- .SmallSpacing()- .WithChildren(- Label()- .Style(UILabelStyle.Body)- .Text(DateConverter.UtcTicksTitle)- )- ),- Cell(- DateConvertDstGridRow.Offset,- DateConvertDstGridColumn.RightContent,- Stack()- .Vertical()- .SmallSpacing()- .WithChildren(- _dstTicksLabel- )- ),- Cell(- DateConvertDstGridRow.DateTime,- DateConvertDstGridColumn.LeftTitle,- Stack()- .Vertical()- .SmallSpacing()- .WithChildren(- Label()- .Style(UILabelStyle.Body)- .Text(DateConverter.LocalDateTime)- )- ),- Cell(- DateConvertDstGridRow.DateTime,- DateConvertDstGridColumn.LeftContent,- Stack()- .Vertical()- .SmallSpacing()- .WithChildren(- _dstLocalDateTimeLabel- )- ),- Cell(- DateConvertDstGridRow.DateTime,- DateConvertDstGridColumn.RightTitle,- Stack()- .Vertical()- .SmallSpacing()- .WithChildren(- Label()- .Style(UILabelStyle.Body)- .Text(DateConverter.UTCDateTime)- )- ),- Cell(- DateConvertDstGridRow.DateTime,- DateConvertDstGridColumn.RightContent,- Stack()- .Vertical()- .SmallSpacing()- .WithChildren(- _dstUtcDateTimeLabel- )- )- )- )- );- }-- private IUIDropDownListItem[] BuildTimeZoneItems()- {- ReadOnlyCollection<TimeZoneInfo> systemTimeZone = TimeZoneInfo.GetSystemTimeZones();- string timeZoneSelectedId = _settingsProvider.GetSetting(timeZoneIdSettings);- var timeZoneDropDownItems = new IUIDropDownListItem[systemTimeZone.Count];-- if (!Regex.IsMatch(systemTimeZone.ElementAt(0).DisplayName, @"^\(UTC.*\).+$"))- {- // version < .Net6- // This implementation mitigates the changes in the strings- // that are obtained when optimized in release builds,- // as the target of external tools is .net6 or earlier.- // zone.DisplayName : "(UTC+09:00) 大阪、札幌、東京"( >= .net6) or "東京 (標準時)"( < .net6)- for (int i = 0; i < systemTimeZone.Count; i++)- {- string displayName = $"(UTC{systemTimeZone[i].BaseUtcOffset.Hours:+00;-00;}:{systemTimeZone[i].BaseUtcOffset.Minutes:00;00;}) " + systemTimeZone[i].DisplayName;- if (systemTimeZone[i].Id == TimeZoneInfo.Utc.Id)- {- displayName = "(UTC) " + systemTimeZone[i].DisplayName;- }- timeZoneDropDownItems[i] = Item(displayName, systemTimeZone[i].Id);- }- }- else- {- // version >= .Net6- for (int i = 0; i < systemTimeZone.Count; i++)- {- string timeZoneId = systemTimeZone[i].Id;- timeZoneDropDownItems[i] = Item(FormatTimeZone(systemTimeZone[i]), timeZoneId);-- if (timeZoneId.Equals(timeZoneSelectedId, StringComparison.OrdinalIgnoreCase))- {- SelectedTimeZoneDropDownItem = timeZoneDropDownItems[i];- }- }- }- return timeZoneDropDownItems.ToArray();- }-- private void ComputeDstInformation(DateTimeOffset dateTimeOffset, TimeZoneInfo timeZone)- {- if (timeZone.IsAmbiguousTime(dateTimeOffset))- {- _dstDaylightSavingLabel.Text(DateConverter.DSTAmbiguousTime);- }- else if (timeZone.IsDaylightSavingTime(dateTimeOffset))- {- _dstDaylightSavingLabel.Text(DateConverter.DaylightSavingTime);- }- else if (timeZone.SupportsDaylightSavingTime)- {- _dstDaylightSavingLabel.Text(DateConverter.SupportsDaylightSavingTime);- }- else- {- _dstDaylightSavingLabel.Text(DateConverter.DisabledDaylightSavingTime);- }- _dstOffsetLabel.Text(dateTimeOffset.Offset.ToString());- _dstTicksLabel.Text(dateTimeOffset.UtcDateTime.Ticks.ToString());- _dstLocalDateTimeLabel.Text(dateTimeOffset.LocalDateTime.ToString("yyyy/MM/dd HH:mm:ss"));- _dstUtcDateTimeLabel.Text(dateTimeOffset.UtcDateTime.ToString("yyyy/MM/dd HH:mm:ss"));- }-- private void PopulateEpoch(DateTimeOffset epoch)- {- _epochYearInputNumber.Value(epoch.Year);- _epochMonthInputNumber.Value(epoch.Month);- _epochDayInputNumber.Value(epoch.Day);- _epochHourInputNumber.Value(epoch.Hour);- _epochMinuteInputNumber.Value(epoch.Minute);- _epochSecondsInputNumber.Value(epoch.Second);- _epochMillisecondsInputNumber.Value(epoch.Millisecond);- }-- private void PopulateDate(DateTimeOffset date)- {- _dateYearInputNumber.Value(date.Year);- _dateMonthInputNumber.Value(date.Month);- _dateDayInputNumber.Value(date.Day);- _dateHourInputNumber.Value(date.Hour);- _dateMinuteInputNumber.Value(date.Minute);- _dateSecondsInputNumber.Value(date.Second);- _dateMillisecondsInputNumber.Value(date.Millisecond);- }-- private static string FormatTimeZone(TimeZoneInfo timeZoneInfo)- {- string displayName = $"(UTC{timeZoneInfo.BaseUtcOffset.Hours:+00;-00;}:{timeZoneInfo.BaseUtcOffset.Minutes:00;00;}) " + timeZoneInfo.StandardName;- if (timeZoneInfo.Id == TimeZoneInfo.Utc.Id)- {- displayName = "(UTC) " + timeZoneInfo.StandardName;- }- return displayName;- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Converters/Date/DateConverterLayoutEnums.cs b/src/app/dev/DevToys.Tools/Tools/Converters/Date/DateConverterLayoutEnums.csdeleted file mode 100644index c2ce36bcb..000000000--- a/src/app/dev/DevToys.Tools/Tools/Converters/Date/DateConverterLayoutEnums.cs+++ /dev/null@@ -1,48 +0,0 @@-namespace DevToys.Tools.Tools.Converters.Date;--internal enum DateConverterGridColumn-{- Content-}--internal enum DateConverterGridRow-{- Header,- Content,- Footer-}--internal enum DateConverterGridDateRow-{- Content-}--internal enum DateConverterGridDateColumn-{- Year,- Month,- Day-}--internal enum DateConverterGridTimeColumn-{- Hour,- Minutes,- Seconds,- Milliseconds-}--internal enum DateConvertDstGridRow-{- Daylight,- Offset,- DateTime-}--internal enum DateConvertDstGridColumn-{- LeftTitle,- LeftContent,- RightTitle,- RightContent-}diff --git a/src/app/dev/DevToys.Tools/Tools/Converters/JsonTable/JsonTableConverter.Designer.cs b/src/app/dev/DevToys.Tools/Tools/Converters/JsonTable/JsonTableConverter.Designer.csdeleted file mode 100644index 71340cfa4..000000000--- a/src/app/dev/DevToys.Tools/Tools/Converters/JsonTable/JsonTableConverter.Designer.cs+++ /dev/null@@ -1,234 +0,0 @@-//-------------------------------------------------------------------------------// <auto-generated>-// This code was generated by a tool.-// Runtime Version:4.0.30319.42000-//-// Changes to this file may cause incorrect behavior and will be lost if-// the code is regenerated.-// </auto-generated>-//--------------------------------------------------------------------------------namespace DevToys.Tools.Tools.Converters.JsonTable {- using System;--- /// <summary>- /// A strongly-typed resource class, for looking up localized strings, etc.- /// </summary>- // This class was auto-generated by the StronglyTypedResourceBuilder- // class via a tool like ResGen or Visual Studio.- // To add or remove a member, edit your .ResX file then rerun ResGen- // with the /str option, or rebuild your VS project.- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]- internal class JsonTableConverter {-- private static global::System.Resources.ResourceManager resourceMan;-- private static global::System.Globalization.CultureInfo resourceCulture;-- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]- internal JsonTableConverter() {- }-- /// <summary>- /// Returns the cached ResourceManager instance used by this class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Resources.ResourceManager ResourceManager {- get {- if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Tools.Tools.Converters.JsonTable.JsonTableConverter", typeof(JsonTableConverter).Assembly);- resourceMan = temp;- }- return resourceMan;- }- }-- /// <summary>- /// Overrides the current thread's CurrentUICulture property for all- /// resource lookups using this strongly typed resource class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Globalization.CultureInfo Culture {- get {- return resourceCulture;- }- set {- resourceCulture = value;- }- }-- /// <summary>- /// Looks up a localized string similar to JSON array to tabular form converter tool.- /// </summary>- internal static string AccessibleName {- get {- return ResourceManager.GetString("AccessibleName", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Select which format is copied to clipboard.- /// </summary>- internal static string ClipboardFormatDescription {- get {- return ResourceManager.GetString("ClipboardFormatDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Clipboard format.- /// </summary>- internal static string ClipboardFormatTitle {- get {- return ResourceManager.GetString("ClipboardFormatTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Configuration.- /// </summary>- internal static string Configuration {- get {- return ResourceManager.GetString("Configuration", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Copy as.- /// </summary>- internal static string CopyAs {- get {- return ResourceManager.GetString("CopyAs", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Comma separated values (CSV).- /// </summary>- internal static string CopyFormatCSV {- get {- return ResourceManager.GetString("CopyFormatCSV", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Semicolon separated values (CSV French).- /// </summary>- internal static string CopyFormatFSV {- get {- return ResourceManager.GetString("CopyFormatFSV", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Tab separated values (TSV).- /// </summary>- internal static string CopyFormatTSV {- get {- return ResourceManager.GetString("CopyFormatTSV", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Convert a JSON array to tabular format, export to CSV or TSV.- /// </summary>- internal static string Description {- get {- return ResourceManager.GetString("Description", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Input.- /// </summary>- internal static string Input {- get {- return ResourceManager.GetString("Input", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Text or path to a file to convert from JSON.- /// </summary>- internal static string InputOptionDescription {- get {- return ResourceManager.GetString("InputOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Please provide a valid JSON array of objects.- /// </summary>- internal static string JsonError {- get {- return ResourceManager.GetString("JsonError", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to JSON Array to Table.- /// </summary>- internal static string LongDisplayTitle {- get {- return ResourceManager.GetString("LongDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Output.- /// </summary>- internal static string Output {- get {- return ResourceManager.GetString("Output", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to File where the result should be persisted..- /// </summary>- internal static string OutputFileOptionDescription {- get {- return ResourceManager.GetString("OutputFileOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Select which format to output.- /// </summary>- internal static string OutputFormatDescription {- get {- return ResourceManager.GetString("OutputFormatDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Save as.- /// </summary>- internal static string SaveAs {- get {- return ResourceManager.GetString("SaveAs", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to JSON CSV TSV French Excel Tabular Data.- /// </summary>- internal static string SearchKeywords {- get {- return ResourceManager.GetString("SearchKeywords", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to JSON > Table.- /// </summary>- internal static string ShortDisplayTitle {- get {- return ResourceManager.GetString("ShortDisplayTitle", resourceCulture);- }- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Converters/JsonTable/JsonTableConverter.resx b/src/app/dev/DevToys.Tools/Tools/Converters/JsonTable/JsonTableConverter.resxdeleted file mode 100644index 4e548fc1d..000000000--- a/src/app/dev/DevToys.Tools/Tools/Converters/JsonTable/JsonTableConverter.resx+++ /dev/null@@ -1,184 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<root>- <!--- Microsoft ResX Schema-- Version 2.0-- The primary goals of this format is to allow a simple XML format- that is mostly human readable. The generation and parsing of the- various data types are done through the TypeConverter classes- associated with the data types.-- Example:-- ... ado.net/XML headers & schema ...- <resheader name="resmimetype">text/microsoft-resx</resheader>- <resheader name="version">2.0</resheader>- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">- <value>[base64 mime encoded serialized .NET Framework object]</value>- </data>- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>- <comment>This is a comment</comment>- </data>-- There are any number of "resheader" rows that contain simple- name/value pairs.-- Each data row contains a name, and value. The row also contains a- type or mimetype. Type corresponds to a .NET class that support- text/value conversion through the TypeConverter architecture.- Classes that don't support this are serialized and stored with the- mimetype set.-- The mimetype is used for serialized objects, and tells the- ResXResourceReader how to depersist the object. This is currently not- extensible. For a given mimetype the value must be set accordingly:-- Note - application/x-microsoft.net.object.binary.base64 is the format- that the ResXResourceWriter will generate, however the reader can- read any of the formats listed below.-- mimetype: application/x-microsoft.net.object.binary.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.soap.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.bytearray.base64- value : The object must be serialized into a byte array- : using a System.ComponentModel.TypeConverter- : and then encoded with base64 encoding.- -->- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />- <xsd:element name="root" msdata:IsDataSet="true">- <xsd:complexType>- <xsd:choice maxOccurs="unbounded">- <xsd:element name="metadata">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" />- </xsd:sequence>- <xsd:attribute name="name" use="required" type="xsd:string" />- <xsd:attribute name="type" type="xsd:string" />- <xsd:attribute name="mimetype" type="xsd:string" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="assembly">- <xsd:complexType>- <xsd:attribute name="alias" type="xsd:string" />- <xsd:attribute name="name" type="xsd:string" />- </xsd:complexType>- </xsd:element>- <xsd:element name="data">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="resheader">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" />- </xsd:complexType>- </xsd:element>- </xsd:choice>- </xsd:complexType>- </xsd:element>- </xsd:schema>- <resheader name="resmimetype">- <value>text/microsoft-resx</value>- </resheader>- <resheader name="version">- <value>2.0</value>- </resheader>- <resheader name="reader">- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <resheader name="writer">- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <data name="AccessibleName" xml:space="preserve">- <value>JSON array to tabular form converter tool</value>- </data>- <data name="LongDisplayTitle" xml:space="preserve">- <value>JSON Array to Table</value>- <comment>Grid view title</comment>- </data>- <data name="Description" xml:space="preserve">- <value>Convert a JSON array to tabular format, export to CSV or TSV</value>- <comment>Grid view description</comment>- </data>- <data name="ShortDisplayTitle" xml:space="preserve">- <value>JSON > Table</value>- <comment>Sidebar heading</comment>- </data>- <data name="SearchKeywords" xml:space="preserve">- <value>JSON CSV TSV French Excel Tabular Data</value>- </data>- <data name="Configuration" xml:space="preserve">- <value>Configuration</value>- </data>- <data name="Input" xml:space="preserve">- <value>Input</value>- </data>- <data name="Output" xml:space="preserve">- <value>Output</value>- </data>- <data name="JsonError" xml:space="preserve">- <value>Please provide a valid JSON array of objects</value>- <comment>Displayed when input isn't a valid JSON array</comment>- </data>- <data name="ClipboardFormatDescription" xml:space="preserve">- <value>Select which format is copied to clipboard</value>- </data>- <data name="ClipboardFormatTitle" xml:space="preserve">- <value>Clipboard format</value>- </data>- <data name="CopyFormatCSV" xml:space="preserve">- <value>Comma separated values (CSV)</value>- </data>- <data name="CopyFormatTSV" xml:space="preserve">- <value>Tab separated values (TSV)</value>- </data>- <data name="CopyFormatFSV" xml:space="preserve">- <value>Semicolon separated values (CSV French)</value>- </data>- <data name="InputOptionDescription" xml:space="preserve">- <value>Text or path to a file to convert from JSON</value>- <comment>CLI parameter description</comment>- </data>- <data name="OutputFileOptionDescription" xml:space="preserve">- <value>File where the result should be persisted.</value>- <comment>CLI parameter description</comment>- </data>- <data name="OutputFormatDescription" xml:space="preserve">- <value>Select which format to output</value>- <comment>CLI parameter description</comment>- </data>- <data name="CopyAs" xml:space="preserve">- <value>Copy as</value>- </data>- <data name="SaveAs" xml:space="preserve">- <value>Save as</value>- </data>-</root>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/Converters/JsonTable/JsonTableConverterCommandLineTool.cs b/src/app/dev/DevToys.Tools/Tools/Converters/JsonTable/JsonTableConverterCommandLineTool.csdeleted file mode 100644index 69385bf23..000000000--- a/src/app/dev/DevToys.Tools/Tools/Converters/JsonTable/JsonTableConverterCommandLineTool.cs+++ /dev/null@@ -1,95 +0,0 @@-using DevToys.Tools.Helpers;-using DevToys.Tools.Tools.Converters.JsonTable;-using Microsoft.Extensions.Logging;-using OneOf;--namespace DevToys.Tools.Tools.Converters.JsonYaml;--[Export(typeof(ICommandLineTool))]-[Name("JsonTableConverter")]-[CommandName(- Name = "jsonToTable",- ResourceManagerBaseName = "DevToys.Tools.Tools.Converters.JsonTable.JsonTableConverter",- DescriptionResourceName = nameof(JsonTableConverter.Description))]-internal sealed class JsonTableConverterCommandLineTool : ICommandLineTool-{- [CommandLineOption(- Name = "input",- Alias = "i",- IsRequired = true,- DescriptionResourceName = nameof(JsonTableConverter.InputOptionDescription))]- internal OneOf<FileInfo, string>? Input { get; set; }-- [CommandLineOption(- Name = "outputFile",- Alias = "o",- DescriptionResourceName = nameof(JsonTableConverter.OutputFileOptionDescription))]- internal FileInfo? OutputFile { get; set; }-- // Default to comma-separated-values because output-to-file is the most likely use-case.- [CommandLineOption(- Name = "format",- DescriptionResourceName = nameof(JsonTableConverter.ClipboardFormatDescription))]- internal JsonTableHelper.CopyFormat Format { get; set; } = JsonTableHelper.CopyFormat.CSV;-- public ValueTask<int> InvokeAsync(ILogger logger, CancellationToken cancellationToken)- {- if (!Input.HasValue)- {- Console.Error.WriteLine(JsonYamlConverter.InvalidInputOrFileCommand);- return ValueTask.FromResult(-1);- }-- return Input.Value.Match(- file =>- InvokeFileAsync(- file,- cancellationToken),- text =>- InvokeCliAsync(- text,- cancellationToken));- }-- private async ValueTask<int> InvokeCliAsync(string input, CancellationToken cancellationToken)- {- Guard.IsNotNull(Input);-- JsonTableHelper.ConvertResult conversionResult = JsonTableHelper.ConvertFromJson(input, Format, cancellationToken);- string resultText = conversionResult.Text;-- cancellationToken.ThrowIfCancellationRequested();-- if (conversionResult.Error != JsonTableHelper.ConvertResultError.None)- {- Console.Error.WriteLine(conversionResult.Error);- return -1;- }-- if (OutputFile == null)- {- Console.WriteLine(resultText);- }- else- {- await File.WriteAllTextAsync(OutputFile.FullName, resultText, cancellationToken);- }-- return 0;- }-- private async ValueTask<int> InvokeFileAsync(FileInfo file, CancellationToken cancellationToken)- {- Guard.IsNotNull(OutputFile);-- if (!file.Exists)- {- Console.Error.WriteLine(JsonYamlConverter.InputFileNotFound);- return -1;- }-- string content = await File.ReadAllTextAsync(file.FullName, cancellationToken);-- return await InvokeCliAsync(content, cancellationToken);- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Converters/JsonTable/JsonTableConverterGuiTool.cs b/src/app/dev/DevToys.Tools/Tools/Converters/JsonTable/JsonTableConverterGuiTool.csdeleted file mode 100644index 4a5299828..000000000--- a/src/app/dev/DevToys.Tools/Tools/Converters/JsonTable/JsonTableConverterGuiTool.cs+++ /dev/null@@ -1,216 +0,0 @@-using System.Data;-using DevToys.Tools.Tools.Converters.JsonTable;-using Microsoft.Extensions.Logging;-using static DevToys.Tools.Helpers.JsonTableHelper;--namespace DevToys.Tools.Tools.Converters.JsonYaml;--[Export(typeof(IGuiTool))]-[Name("JsonTableConverter")]-[ToolDisplayInformation(- IconFontName = "FluentSystemIcons",- IconGlyph = '\uF0D8',- GroupName = PredefinedCommonToolGroupNames.Converters,- ResourceManagerAssemblyIdentifier = nameof(DevToysToolsResourceManagerAssemblyIdentifier),- ResourceManagerBaseName = "DevToys.Tools.Tools.Converters.JsonTable.JsonTableConverter",- ShortDisplayTitleResourceName = nameof(JsonTableConverter.ShortDisplayTitle),- LongDisplayTitleResourceName = nameof(JsonTableConverter.LongDisplayTitle),- DescriptionResourceName = nameof(JsonTableConverter.Description),- AccessibleNameResourceName = nameof(JsonTableConverter.AccessibleName),- SearchKeywordsResourceName = nameof(JsonTableConverter.SearchKeywords))]-[AcceptedDataTypeName(PredefinedCommonDataTypeNames.JsonArray)]-internal sealed partial class JsonTableConverterGuiTool : IGuiTool, IDisposable-{- private readonly ILogger _logger;- private readonly IClipboard _clipboard;- private readonly IFileStorage _fileStorage;-- private readonly IUIMultiLineTextInput _inputTextArea = MultilineTextInput("json-input-text-area");- private readonly IUIDataGrid _outputDataGrid = DataGrid("output-data-grid");- private readonly IUIStack _copyOrSaveStack = Stack("copy-or-save-data-grid");-- private readonly DisposableSemaphore _semaphore = new(); // one convert at a time- private CancellationTokenSource? _cancellationTokenSource;-- [ImportingConstructor]- public JsonTableConverterGuiTool(IClipboard clipboard, IFileStorage fileStorage)- {- _logger = this.Log();- _clipboard = clipboard;- _fileStorage = fileStorage;- }-- internal Task? WorkTask { get; private set; }-- public UIToolView View- => new(- isScrollable: false,- SplitGrid()- .Vertical()- .WithLeftPaneChild(-- _inputTextArea- .Title(JsonTableConverter.Input)- .Language("json")- .OnTextChanged(OnInputTextChanged))-- .WithRightPaneChild(-- _outputDataGrid- .Title(JsonTableConverter.Output)- .Extendable()- .CommandBarExtraContent(- _copyOrSaveStack- .Horizontal()- .Disable() // disable until valid JSON is input- .WithChildren(-- DropDownButton()- .Icon("FluentSystemIcons", '\uF32B')- .Text(JsonTableConverter.CopyAs)- .WithMenuItems(- DropDownMenuItem(JsonTableConverter.CopyFormatCSV).OnClick(OnCopyCSV),- DropDownMenuItem(JsonTableConverter.CopyFormatTSV).OnClick(OnCopyTSV),- DropDownMenuItem(JsonTableConverter.CopyFormatFSV).OnClick(OnCopyFSV)),-- DropDownButton()- .Icon("FluentSystemIcons", '\uF67F')- .Text(JsonTableConverter.SaveAs)- .WithMenuItems(- DropDownMenuItem(JsonTableConverter.CopyFormatCSV).OnClick(OnSaveCSV),- DropDownMenuItem(JsonTableConverter.CopyFormatTSV).OnClick(OnSaveTSV),- DropDownMenuItem(JsonTableConverter.CopyFormatFSV).OnClick(OnSaveFSV))))));-- // Smart detection handler.- public void OnDataReceived(string dataTypeName, object? parsedData)- {- if (dataTypeName == PredefinedCommonDataTypeNames.JsonArray &&- parsedData is string jsonStrongTypedParsedData)- {- _inputTextArea.Text(jsonStrongTypedParsedData);- }- }-- public void Dispose()- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _semaphore.Dispose();- }-- private void OnInputTextChanged(string text)- {- StartConvert(ConvertTarget.DataGrid, null);- }-- private void StartConvert(ConvertTarget target, CopyFormat? copyFormat)- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _cancellationTokenSource = new CancellationTokenSource();-- WorkTask = ConvertAsync(target, copyFormat, _cancellationTokenSource.Token);- }-- private async Task ConvertAsync(ConvertTarget target, CopyFormat? copyFormat, CancellationToken cancellationToken)- {- using (await _semaphore.WaitAsync(cancellationToken))- {- await TaskSchedulerAwaiter.SwitchOffMainThreadAsync(cancellationToken);-- if (target == ConvertTarget.Clipboard || target == ConvertTarget.Save)- {- Guard.IsNotNull(copyFormat);- }-- ConvertResult conversionResult = ConvertFromJson(_inputTextArea.Text, copyFormat, cancellationToken);-- if (conversionResult.Error == ConvertResultError.None && conversionResult.Data != null)- {- _copyOrSaveStack.Enable();- switch (target)- {- case ConvertTarget.DataGrid:- SetDataGridData(conversionResult.Data);- break;-- case ConvertTarget.Clipboard:- await _clipboard.SetClipboardTextAsync(conversionResult.Text);- break;-- case ConvertTarget.Save:- {- using Stream? fileStream = await _fileStorage.PickSaveFileAsync("txt", "csv");- if (fileStream is not null)- {- using var writer = new StreamWriter(fileStream);- writer.Write(conversionResult.Text);- }- }- break;- }- }- else- {- _copyOrSaveStack.Disable();- SetDataGridError();- }- }- }-- private enum ConvertTarget- {- DataGrid,- Clipboard,- Save- }-- private void SetDataGridData(DataGridContents table)- {- IUIDataGridRow[] rows = table.Rows.Select(r => Row(null, r)).ToArray();- _outputDataGrid.WithColumns(table.Headings);- _outputDataGrid.WithRows(rows);- }-- private void SetDataGridError()- {- _outputDataGrid.WithColumns(JsonTableConverter.JsonError);- _outputDataGrid.WithRows();- }-- private ValueTask OnCopyCSV()- {- StartConvert(ConvertTarget.Clipboard, CopyFormat.CSV);- return ValueTask.CompletedTask;- }-- private ValueTask OnCopyTSV()- {- StartConvert(ConvertTarget.Clipboard, CopyFormat.TSV);- return ValueTask.CompletedTask;- }-- private ValueTask OnCopyFSV()- {- StartConvert(ConvertTarget.Clipboard, CopyFormat.FSV);- return ValueTask.CompletedTask;- }-- private ValueTask OnSaveCSV()- {- StartConvert(ConvertTarget.Save, CopyFormat.CSV);- return ValueTask.CompletedTask;- }-- private ValueTask OnSaveTSV()- {- StartConvert(ConvertTarget.Save, CopyFormat.TSV);- return ValueTask.CompletedTask;- }-- private ValueTask OnSaveFSV()- {- StartConvert(ConvertTarget.Save, CopyFormat.FSV);- return ValueTask.CompletedTask;- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Converters/JsonYaml/JsonYamlConverter.Designer.cs b/src/app/dev/DevToys.Tools/Tools/Converters/JsonYaml/JsonYamlConverter.Designer.csdeleted file mode 100644index 49b2e30f4..000000000--- a/src/app/dev/DevToys.Tools/Tools/Converters/JsonYaml/JsonYamlConverter.Designer.cs+++ /dev/null@@ -1,261 +0,0 @@-//-------------------------------------------------------------------------------// <auto-generated>-// This code was generated by a tool.-// Runtime Version:4.0.30319.42000-//-// Changes to this file may cause incorrect behavior and will be lost if-// the code is regenerated.-// </auto-generated>-//--------------------------------------------------------------------------------namespace DevToys.Tools.Tools.Converters.JsonYaml {- using System;--- /// <summary>- /// A strongly-typed resource class, for looking up localized strings, etc.- /// </summary>- // This class was auto-generated by the StronglyTypedResourceBuilder- // class via a tool like ResGen or Visual Studio.- // To add or remove a member, edit your .ResX file then rerun ResGen- // with the /str option, or rebuild your VS project.- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]- internal class JsonYamlConverter {-- private static global::System.Resources.ResourceManager resourceMan;-- private static global::System.Globalization.CultureInfo resourceCulture;-- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]- internal JsonYamlConverter() {- }-- /// <summary>- /// Returns the cached ResourceManager instance used by this class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Resources.ResourceManager ResourceManager {- get {- if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Tools.Tools.Converters.JsonYaml.JsonYamlConverter", typeof(JsonYamlConverter).Assembly);- resourceMan = temp;- }- return resourceMan;- }- }-- /// <summary>- /// Overrides the current thread's CurrentUICulture property for all- /// resource lookups using this strongly typed resource class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Globalization.CultureInfo Culture {- get {- return resourceCulture;- }- set {- resourceCulture = value;- }- }-- /// <summary>- /// Looks up a localized string similar to JSON to YAML and YAML to JSON converter tool.- /// </summary>- internal static string AccessibleName {- get {- return ResourceManager.GetString("AccessibleName", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Configuration.- /// </summary>- internal static string Configuration {- get {- return ResourceManager.GetString("Configuration", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Select which conversion mode you want to use.- /// </summary>- internal static string ConversionDescription {- get {- return ResourceManager.GetString("ConversionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Whether to convert from Json or Yaml.- /// </summary>- internal static string ConversionOptionDescription {- get {- return ResourceManager.GetString("ConversionOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Conversion.- /// </summary>- internal static string ConversionTitle {- get {- return ResourceManager.GetString("ConversionTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Convert JSON data to YAML and vice versa.- /// </summary>- internal static string Description {- get {- return ResourceManager.GetString("Description", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to 4 spaces.- /// </summary>- internal static string FourSpaces {- get {- return ResourceManager.GetString("FourSpaces", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Indentation.- /// </summary>- internal static string Indentation {- get {- return ResourceManager.GetString("Indentation", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Select which indentation you want to use.- /// </summary>- internal static string IndentationOptionDescription {- get {- return ResourceManager.GetString("IndentationOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Input.- /// </summary>- internal static string Input {- get {- return ResourceManager.GetString("Input", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Input file selected doesn't exist..- /// </summary>- internal static string InputFileNotFound {- get {- return ResourceManager.GetString("InputFileNotFound", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Text or path to a file to convert from json or yaml.- /// </summary>- internal static string InputOptionDescription {- get {- return ResourceManager.GetString("InputOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Please specify an input text or an input file.- /// </summary>- internal static string InvalidInputOrFileCommand {- get {- return ResourceManager.GetString("InvalidInputOrFileCommand", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to <Invalid JSON data>.- /// </summary>- internal static string InvalidJson {- get {- return ResourceManager.GetString("InvalidJson", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to <Invalid Yaml data>.- /// </summary>- internal static string InvalidYaml {- get {- return ResourceManager.GetString("InvalidYaml", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to JSON to YAML.- /// </summary>- internal static string JsonToYaml {- get {- return ResourceManager.GetString("JsonToYaml", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to JSON <> YAML Converter.- /// </summary>- internal static string LongDisplayTitle {- get {- return ResourceManager.GetString("LongDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Output.- /// </summary>- internal static string Output {- get {- return ResourceManager.GetString("Output", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Path to the output file.- /// </summary>- internal static string OutputFileOptionDescription {- get {- return ResourceManager.GetString("OutputFileOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to JSON <> YAML.- /// </summary>- internal static string ShortDisplayTitle {- get {- return ResourceManager.GetString("ShortDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to 2 spaces.- /// </summary>- internal static string TwoSpaces {- get {- return ResourceManager.GetString("TwoSpaces", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to YAML to JSON.- /// </summary>- internal static string YamlToJson {- get {- return ResourceManager.GetString("YamlToJson", resourceCulture);- }- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Converters/JsonYaml/JsonYamlConverter.resx b/src/app/dev/DevToys.Tools/Tools/Converters/JsonYaml/JsonYamlConverter.resxdeleted file mode 100644index 7ef4bcf7e..000000000--- a/src/app/dev/DevToys.Tools/Tools/Converters/JsonYaml/JsonYamlConverter.resx+++ /dev/null@@ -1,186 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<root>- <!--- Microsoft ResX Schema-- Version 2.0-- The primary goals of this format is to allow a simple XML format- that is mostly human readable. The generation and parsing of the- various data types are done through the TypeConverter classes- associated with the data types.-- Example:-- ... ado.net/XML headers & schema ...- <resheader name="resmimetype">text/microsoft-resx</resheader>- <resheader name="version">2.0</resheader>- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">- <value>[base64 mime encoded serialized .NET Framework object]</value>- </data>- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>- <comment>This is a comment</comment>- </data>-- There are any number of "resheader" rows that contain simple- name/value pairs.-- Each data row contains a name, and value. The row also contains a- type or mimetype. Type corresponds to a .NET class that support- text/value conversion through the TypeConverter architecture.- Classes that don't support this are serialized and stored with the- mimetype set.-- The mimetype is used for serialized objects, and tells the- ResXResourceReader how to depersist the object. This is currently not- extensible. For a given mimetype the value must be set accordingly:-- Note - application/x-microsoft.net.object.binary.base64 is the format- that the ResXResourceWriter will generate, however the reader can- read any of the formats listed below.-- mimetype: application/x-microsoft.net.object.binary.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.soap.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.bytearray.base64- value : The object must be serialized into a byte array- : using a System.ComponentModel.TypeConverter- : and then encoded with base64 encoding.- -->- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />- <xsd:element name="root" msdata:IsDataSet="true">- <xsd:complexType>- <xsd:choice maxOccurs="unbounded">- <xsd:element name="metadata">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" />- </xsd:sequence>- <xsd:attribute name="name" use="required" type="xsd:string" />- <xsd:attribute name="type" type="xsd:string" />- <xsd:attribute name="mimetype" type="xsd:string" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="assembly">- <xsd:complexType>- <xsd:attribute name="alias" type="xsd:string" />- <xsd:attribute name="name" type="xsd:string" />- </xsd:complexType>- </xsd:element>- <xsd:element name="data">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="resheader">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" />- </xsd:complexType>- </xsd:element>- </xsd:choice>- </xsd:complexType>- </xsd:element>- </xsd:schema>- <resheader name="resmimetype">- <value>text/microsoft-resx</value>- </resheader>- <resheader name="version">- <value>2.0</value>- </resheader>- <resheader name="reader">- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <resheader name="writer">- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <data name="AccessibleName" xml:space="preserve">- <value>JSON to YAML and YAML to JSON converter tool</value>- </data>- <data name="Configuration" xml:space="preserve">- <value>Configuration</value>- </data>- <data name="ConversionDescription" xml:space="preserve">- <value>Select which conversion mode you want to use</value>- </data>- <data name="ConversionOptionDescription" xml:space="preserve">- <value>Whether to convert from Json or Yaml</value>- </data>- <data name="ConversionTitle" xml:space="preserve">- <value>Conversion</value>- </data>- <data name="Description" xml:space="preserve">- <value>Convert JSON data to YAML and vice versa</value>- </data>- <data name="FourSpaces" xml:space="preserve">- <value>4 spaces</value>- </data>- <data name="Indentation" xml:space="preserve">- <value>Indentation</value>- </data>- <data name="IndentationOptionDescription" xml:space="preserve">- <value>Select which indentation you want to use</value>- </data>- <data name="Input" xml:space="preserve">- <value>Input</value>- </data>- <data name="InputFileNotFound" xml:space="preserve">- <value>Input file selected doesn't exist.</value>- </data>- <data name="InputOptionDescription" xml:space="preserve">- <value>Text or path to a file to convert from json or yaml</value>- </data>- <data name="InvalidInputOrFileCommand" xml:space="preserve">- <value>Please specify an input text or an input file</value>- </data>- <data name="InvalidJson" xml:space="preserve">- <value><Invalid JSON data></value>- </data>- <data name="InvalidYaml" xml:space="preserve">- <value><Invalid Yaml data></value>- </data>- <data name="JsonToYaml" xml:space="preserve">- <value>JSON to YAML</value>- </data>- <data name="LongDisplayTitle" xml:space="preserve">- <value>JSON <> YAML Converter</value>- </data>- <data name="Output" xml:space="preserve">- <value>Output</value>- </data>- <data name="OutputFileOptionDescription" xml:space="preserve">- <value>Path to the output file</value>- </data>- <data name="ShortDisplayTitle" xml:space="preserve">- <value>JSON <> YAML</value>- </data>- <data name="TwoSpaces" xml:space="preserve">- <value>2 spaces</value>- </data>- <data name="YamlToJson" xml:space="preserve">- <value>YAML to JSON</value>- </data>-</root>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/Converters/JsonYaml/JsonYamlConverterCommandLineTool.cs b/src/app/dev/DevToys.Tools/Tools/Converters/JsonYaml/JsonYamlConverterCommandLineTool.csdeleted file mode 100644index 6678d636d..000000000--- a/src/app/dev/DevToys.Tools/Tools/Converters/JsonYaml/JsonYamlConverterCommandLineTool.cs+++ /dev/null@@ -1,80 +0,0 @@-using DevToys.Tools.Helpers;-using DevToys.Tools.Models;-using Microsoft.Extensions.Logging;-using OneOf;--namespace DevToys.Tools.Tools.Converters.JsonYaml;--[Export(typeof(ICommandLineTool))]-[Name("JsonYamlConverter")]-[CommandName(- Name = "jsonToYaml",- ResourceManagerBaseName = "DevToys.Tools.Tools.Converters.JsonYaml.JsonYamlConverter",- DescriptionResourceName = nameof(JsonYamlConverter.Description))]-internal sealed class JsonYamlConverterCommandLineTool : ICommandLineTool-{-#pragma warning disable IDE0044 // Add readonly modifier- [Import]- private IFileStorage _fileStorage = null!;-#pragma warning restore IDE0044 // Add readonly modifier- [CommandLineOption(- Name = "input",- Alias = "i",- IsRequired = true,- DescriptionResourceName = nameof(JsonYamlConverter.InputOptionDescription))]- internal OneOf<FileInfo, string>? Input { get; set; }-- [CommandLineOption(- Name = "outputFile",- Alias = "o",- DescriptionResourceName = nameof(JsonYamlConverter.OutputFileOptionDescription))]- internal FileInfo? OutputFile { get; set; }-- [CommandLineOption(- Name = "conversion",- Alias = "c",- IsRequired = true,- DescriptionResourceName = nameof(JsonYamlConverter.ConversionOptionDescription))]- internal JsonToYamlConversion ConversionMode { get; set; } = JsonToYamlConversion.JsonToYaml;-- [CommandLineOption(- Name = "indentation",- DescriptionResourceName = nameof(JsonYamlConverter.IndentationOptionDescription))]- internal Indentation IndentationMode { get; set; } = Indentation.TwoSpaces;-- public async ValueTask<int> InvokeAsync(ILogger logger, CancellationToken cancellationToken)- {- if (!Input.HasValue)- {- Console.Error.WriteLine(JsonYamlConverter.InvalidInputOrFileCommand);- return -1;- }-- ResultInfo<string> input = await Input.Value.ReadAllTextAsync(_fileStorage, cancellationToken);- if (!input.HasSucceeded)- {- Console.Error.WriteLine(JsonYamlConverter.InputFileNotFound);- return -1;- }-- Guard.IsNotNull(input.Data);- ResultInfo<string> conversionResult = await JsonYamlHelper.ConvertAsync(- input.Data,- ConversionMode,- IndentationMode,- logger,- cancellationToken- );-- cancellationToken.ThrowIfCancellationRequested();-- if (!conversionResult.HasSucceeded)- {- Console.Error.WriteLine(conversionResult.Data);- return -1;- }-- await FileHelper.WriteOutputAsync(conversionResult.Data, OutputFile, cancellationToken);- return 0;- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Converters/JsonYaml/JsonYamlConverterGuiTool.cs b/src/app/dev/DevToys.Tools/Tools/Converters/JsonYaml/JsonYamlConverterGuiTool.csdeleted file mode 100644index a7d2828f2..000000000--- a/src/app/dev/DevToys.Tools/Tools/Converters/JsonYaml/JsonYamlConverterGuiTool.cs+++ /dev/null@@ -1,236 +0,0 @@-using DevToys.Tools.Helpers;-using DevToys.Tools.Models;-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.Tools.Converters.JsonYaml;--[Export(typeof(IGuiTool))]-[Name("JsonYamlConverter")]-[ToolDisplayInformation(- IconFontName = "DevToys-Tools-Icons",- IconGlyph = '\u0109',- GroupName = PredefinedCommonToolGroupNames.Converters,- ResourceManagerAssemblyIdentifier = nameof(DevToysToolsResourceManagerAssemblyIdentifier),- ResourceManagerBaseName = "DevToys.Tools.Tools.Converters.JsonYaml.JsonYamlConverter",- ShortDisplayTitleResourceName = nameof(JsonYamlConverter.ShortDisplayTitle),- LongDisplayTitleResourceName = nameof(JsonYamlConverter.LongDisplayTitle),- DescriptionResourceName = nameof(JsonYamlConverter.Description),- AccessibleNameResourceName = nameof(JsonYamlConverter.AccessibleName))]-[AcceptedDataTypeName(PredefinedCommonDataTypeNames.Json)]-[AcceptedDataTypeName(PredefinedCommonDataTypeNames.Yaml)]-internal sealed partial class JsonYamlConverterGuiTool : IGuiTool, IDisposable-{- private const string JsonLanguage = "json";- private const string YamlLanguage = "yaml";-- /// <summary>- /// Whether the tool should convert Json to Yaml or Yaml to Json.- /// </summary>- private static readonly SettingDefinition<JsonToYamlConversion> conversionMode- = new(name: $"{nameof(JsonYamlConverterGuiTool)}.{nameof(conversionMode)}", defaultValue: JsonToYamlConversion.JsonToYaml);-- /// <summary>- /// Which indentation the tool need to use.- /// </summary>- private static readonly SettingDefinition<Indentation> indentationMode- = new(name: $"{nameof(JsonYamlConverterGuiTool)}.{nameof(indentationMode)}", defaultValue: Indentation.TwoSpaces);-- private enum GridColumn- {- Content- }-- private enum GridRow- {- Header,- Content,- Footer- }-- private readonly DisposableSemaphore _semaphore = new();- private readonly ILogger _logger;- private readonly ISettingsProvider _settingsProvider;- private readonly IUIMultiLineTextInput _inputTextArea = MultilineTextInput("json-to-yaml-input-text-area");- private readonly IUIMultiLineTextInput _outputTextArea = MultilineTextInput("json-to-yaml-output-text-area");-- private CancellationTokenSource? _cancellationTokenSource;-- [ImportingConstructor]- public JsonYamlConverterGuiTool(ISettingsProvider settingsProvider)- {- _logger = this.Log();- _settingsProvider = settingsProvider;-- switch (_settingsProvider.GetSetting(conversionMode))- {- case JsonToYamlConversion.JsonToYaml:- SetJsonToYamlConversion();- break;- case JsonToYamlConversion.YamlToJson:- SetYamlToJsonConversion();- break;- default:- throw new NotSupportedException();- }- }-- internal Task? WorkTask { get; private set; }-- public UIToolView View- => new(- isScrollable: true,- Grid()- .ColumnLargeSpacing()- .RowLargeSpacing()- .Rows(- (GridRow.Header, Auto),- (GridRow.Content, new UIGridLength(1, UIGridUnitType.Fraction))- )- .Columns(- (GridColumn.Content, new UIGridLength(1, UIGridUnitType.Fraction))- )- .Cells(- Cell(- GridRow.Header,- GridColumn.Content,- Stack().Vertical().WithChildren(- Label()- .Text(JsonYamlConverter.Configuration),- Setting("json-to-yaml-text-conversion-setting")- .Icon("FluentSystemIcons", '\uF18D')- .Title(JsonYamlConverter.ConversionTitle)- .Description(JsonYamlConverter.ConversionDescription)- .Handle(- _settingsProvider,- conversionMode,- OnConversionModeChanged,- Item(JsonYamlConverter.JsonToYaml, JsonToYamlConversion.JsonToYaml),- Item(JsonYamlConverter.YamlToJson, JsonToYamlConversion.YamlToJson)- ),- Setting("json-to-yaml-text-indentation-setting")- .Icon("FluentSystemIcons", '\uF6F8')- .Title(JsonYamlConverter.Indentation)- .Handle(- _settingsProvider,- indentationMode,- OnIndentationModelChanged,- Item(JsonYamlConverter.TwoSpaces, Indentation.TwoSpaces),- Item(JsonYamlConverter.FourSpaces, Indentation.FourSpaces)- )- )- ),- Cell(- GridRow.Content,- GridColumn.Content,- SplitGrid()- .Vertical()- .WithLeftPaneChild(- _inputTextArea- .Title(JsonYamlConverter.Input)- .OnTextChanged(OnInputTextChanged))- .WithRightPaneChild(- _outputTextArea- .Title(JsonYamlConverter.Output)- .ReadOnly()- .Extendable())- )- )- );-- // Smart detection handler.- public void OnDataReceived(string dataTypeName, object? parsedData)- {- if (dataTypeName == PredefinedCommonDataTypeNames.Json &&- parsedData is string jsonStrongTypedParsedData)- {- _inputTextArea.Language(JsonLanguage);- _outputTextArea.Language(YamlLanguage);- _settingsProvider.SetSetting(conversionMode, JsonToYamlConversion.JsonToYaml);- _inputTextArea.Text(jsonStrongTypedParsedData);- }-- if (dataTypeName == PredefinedCommonDataTypeNames.Yaml &&- parsedData is string yamlStrongTypedParsedData)- {- _inputTextArea.Language(YamlLanguage);- _outputTextArea.Language(JsonLanguage);- _settingsProvider.SetSetting(conversionMode, JsonToYamlConversion.YamlToJson);- _inputTextArea.Text(yamlStrongTypedParsedData);- }- }-- public void Dispose()- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _semaphore.Dispose();- }-- private void OnConversionModeChanged(JsonToYamlConversion conversionMode)- {- switch (conversionMode)- {- case JsonToYamlConversion.JsonToYaml:- SetJsonToYamlConversion();- break;- case JsonToYamlConversion.YamlToJson:- SetYamlToJsonConversion();- break;- default:- throw new NotSupportedException();- }-- _inputTextArea.Text(_outputTextArea.Text);- }-- private void OnIndentationModelChanged(Indentation indentationMode)- {- StartConvert(_inputTextArea.Text);- }-- private void OnInputTextChanged(string text)- {- StartConvert(text);- }-- private void StartConvert(string text)- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _cancellationTokenSource = new CancellationTokenSource();-- WorkTask = ConvertAsync(text, _settingsProvider.GetSetting(conversionMode), _settingsProvider.GetSetting(indentationMode), _cancellationTokenSource.Token);- }-- private async Task ConvertAsync(string input, JsonToYamlConversion conversionModeSetting, Indentation indentationModeSetting, CancellationToken cancellationToken)- {- using (await _semaphore.WaitAsync(cancellationToken))- {- await TaskSchedulerAwaiter.SwitchOffMainThreadAsync(cancellationToken);-- ResultInfo<string> conversionResult = await JsonYamlHelper.ConvertAsync(- input,- conversionModeSetting,- indentationModeSetting,- _logger,- cancellationToken);- _outputTextArea.Text(conversionResult.Data!);- }- }-- private void SetJsonToYamlConversion()- {- _inputTextArea- .Language(JsonLanguage);- _outputTextArea- .Language(YamlLanguage);- }-- private void SetYamlToJsonConversion()- {- _inputTextArea- .Language(YamlLanguage);- _outputTextArea- .Language(JsonLanguage);- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Converters/NumberBase/INumberBaseConverterGuiToolMode.cs b/src/app/dev/DevToys.Tools/Tools/Converters/NumberBase/INumberBaseConverterGuiToolMode.csdeleted file mode 100644index 7d4bed6bc..000000000--- a/src/app/dev/DevToys.Tools/Tools/Converters/NumberBase/INumberBaseConverterGuiToolMode.cs+++ /dev/null@@ -1,12 +0,0 @@-using DevToys.Tools.Models.NumberBase;--namespace DevToys.Tools.Tools.Converters.NumberBase;--internal interface INumberBaseConverterGuiToolMode-{- IUIElement View { get; }-- void OnInputChanged();-- void OnDataReceived(object? parsedData);-}diff --git a/src/app/dev/DevToys.Tools/Tools/Converters/NumberBase/NumberBaseConverter.Designer.cs b/src/app/dev/DevToys.Tools/Tools/Converters/NumberBase/NumberBaseConverter.Designer.csdeleted file mode 100644index 4c38a42f3..000000000--- a/src/app/dev/DevToys.Tools/Tools/Converters/NumberBase/NumberBaseConverter.Designer.cs+++ /dev/null@@ -1,306 +0,0 @@-//-------------------------------------------------------------------------------// <auto-generated>-// This code was generated by a tool.-// Runtime Version:4.0.30319.42000-//-// Changes to this file may cause incorrect behavior and will be lost if-// the code is regenerated.-// </auto-generated>-//--------------------------------------------------------------------------------namespace DevToys.Tools.Tools.Converters.NumberBase {- using System;--- /// <summary>- /// A strongly-typed resource class, for looking up localized strings, etc.- /// </summary>- // This class was auto-generated by the StronglyTypedResourceBuilder- // class via a tool like ResGen or Visual Studio.- // To add or remove a member, edit your .ResX file then rerun ResGen- // with the /str option, or rebuild your VS project.- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]- internal class NumberBaseConverter {-- private static global::System.Resources.ResourceManager resourceMan;-- private static global::System.Globalization.CultureInfo resourceCulture;-- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]- internal NumberBaseConverter() {- }-- /// <summary>- /// Returns the cached ResourceManager instance used by this class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Resources.ResourceManager ResourceManager {- get {- if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Tools.Tools.Converters.NumberBase.NumberBaseConverter", typeof(NumberBaseConverter).Assembly);- resourceMan = temp;- }- return resourceMan;- }- }-- /// <summary>- /// Overrides the current thread's CurrentUICulture property for all- /// resource lookups using this strongly typed resource class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Globalization.CultureInfo Culture {- get {- return resourceCulture;- }- set {- resourceCulture = value;- }- }-- /// <summary>- /// Looks up a localized string similar to Number Base Converter tool.- /// </summary>- internal static string AccessibleName {- get {- return ResourceManager.GetString("AccessibleName", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Advanced mode.- /// </summary>- internal static string AdvancedMode {- get {- return ResourceManager.GetString("AdvancedMode", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Binary.- /// </summary>- internal static string Binary {- get {- return ResourceManager.GetString("Binary", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Configuration.- /// </summary>- internal static string Configuration {- get {- return ResourceManager.GetString("Configuration", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Please set at least two characters in the custom dictionary.- /// </summary>- internal static string CustomDictionaryTooSmall {- get {- return ResourceManager.GetString("CustomDictionaryTooSmall", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Custom format.- /// </summary>- internal static string CustomFormat {- get {- return ResourceManager.GetString("CustomFormat", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Decimal.- /// </summary>- internal static string Decimal {- get {- return ResourceManager.GetString("Decimal", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Convert numbers from one base to another.- /// </summary>- internal static string Description {- get {- return ResourceManager.GetString("Description", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Format number.- /// </summary>- internal static string Format {- get {- return ResourceManager.GetString("Format", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Hexadecimal.- /// </summary>- internal static string Hexadecimal {- get {- return ResourceManager.GetString("Hexadecimal", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Input.- /// </summary>- internal static string Input {- get {- return ResourceManager.GetString("Input", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The base of the number to convert.- /// </summary>- internal static string InputBaseOptionDescription {- get {- return ResourceManager.GetString("InputBaseOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Input dictionary.- /// </summary>- internal static string InputDictionary {- get {- return ResourceManager.GetString("InputDictionary", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Number to convert.- /// </summary>- internal static string InputOptionDescription {- get {- return ResourceManager.GetString("InputOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Number Base Converter.- /// </summary>- internal static string LongDisplayTitle {- get {- return ResourceManager.GetString("LongDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Octal.- /// </summary>- internal static string Octal {- get {- return ResourceManager.GetString("Octal", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Output.- /// </summary>- internal static string Output {- get {- return ResourceManager.GetString("Output", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The desired base to convert to..- /// </summary>- internal static string OutputBaseOptionDescription {- get {- return ResourceManager.GetString("OutputBaseOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Output dictionary.- /// </summary>- internal static string OutputDictionary {- get {- return ResourceManager.GetString("OutputDictionary", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to RFC-4648 Base16.- /// </summary>- internal static string RFC4648Base16 {- get {- return ResourceManager.GetString("RFC4648Base16", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to RFC-4648 Base32.- /// </summary>- internal static string RFC4648Base32 {- get {- return ResourceManager.GetString("RFC4648Base32", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to RFC-4648 Base32 Extended Hex.- /// </summary>- internal static string RFC4648Base32ExtendedHex {- get {- return ResourceManager.GetString("RFC4648Base32ExtendedHex", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to RFC-4648 Base64.- /// </summary>- internal static string RFC4648Base64 {- get {- return ResourceManager.GetString("RFC4648Base64", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to RFC-4648 Base64 Url Encode.- /// </summary>- internal static string RFC4648Base64UrlEncode {- get {- return ResourceManager.GetString("RFC4648Base64UrlEncode", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Number Base.- /// </summary>- internal static string ShortDisplayTitle {- get {- return ResourceManager.GetString("ShortDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The current {0} value isn't valid.- /// </summary>- internal static string ValueInvalid {- get {- return ResourceManager.GetString("ValueInvalid", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The current {0} value cannot be converted as it exceeds the maximum value ({1}).- /// </summary>- internal static string ValueOverflow {- get {- return ResourceManager.GetString("ValueOverflow", resourceCulture);- }- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Converters/NumberBase/NumberBaseConverter.resx b/src/app/dev/DevToys.Tools/Tools/Converters/NumberBase/NumberBaseConverter.resxdeleted file mode 100644index 229956c09..000000000--- a/src/app/dev/DevToys.Tools/Tools/Converters/NumberBase/NumberBaseConverter.resx+++ /dev/null@@ -1,204 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<root>- <!--- Microsoft ResX Schema-- Version 2.0-- The primary goals of this format is to allow a simple XML format- that is mostly human readable. The generation and parsing of the- various data types are done through the TypeConverter classes- associated with the data types.-- Example:-- ... ado.net/XML headers & schema ...- <resheader name="resmimetype">text/microsoft-resx</resheader>- <resheader name="version">2.0</resheader>- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">- <value>[base64 mime encoded serialized .NET Framework object]</value>- </data>- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>- <comment>This is a comment</comment>- </data>-- There are any number of "resheader" rows that contain simple- name/value pairs.-- Each data row contains a name, and value. The row also contains a- type or mimetype. Type corresponds to a .NET class that support- text/value conversion through the TypeConverter architecture.- Classes that don't support this are serialized and stored with the- mimetype set.-- The mimetype is used for serialized objects, and tells the- ResXResourceReader how to depersist the object. This is currently not- extensible. For a given mimetype the value must be set accordingly:-- Note - application/x-microsoft.net.object.binary.base64 is the format- that the ResXResourceWriter will generate, however the reader can- read any of the formats listed below.-- mimetype: application/x-microsoft.net.object.binary.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.soap.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.bytearray.base64- value : The object must be serialized into a byte array- : using a System.ComponentModel.TypeConverter- : and then encoded with base64 encoding.- -->- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />- <xsd:element name="root" msdata:IsDataSet="true">- <xsd:complexType>- <xsd:choice maxOccurs="unbounded">- <xsd:element name="metadata">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" />- </xsd:sequence>- <xsd:attribute name="name" use="required" type="xsd:string" />- <xsd:attribute name="type" type="xsd:string" />- <xsd:attribute name="mimetype" type="xsd:string" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="assembly">- <xsd:complexType>- <xsd:attribute name="alias" type="xsd:string" />- <xsd:attribute name="name" type="xsd:string" />- </xsd:complexType>- </xsd:element>- <xsd:element name="data">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="resheader">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" />- </xsd:complexType>- </xsd:element>- </xsd:choice>- </xsd:complexType>- </xsd:element>- </xsd:schema>- <resheader name="resmimetype">- <value>text/microsoft-resx</value>- </resheader>- <resheader name="version">- <value>2.0</value>- </resheader>- <resheader name="reader">- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <resheader name="writer">- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <data name="AccessibleName" xml:space="preserve">- <value>Number Base Converter tool</value>- </data>- <data name="AdvancedMode" xml:space="preserve">- <value>Advanced mode</value>- </data>- <data name="Binary" xml:space="preserve">- <value>Binary</value>- </data>- <data name="Configuration" xml:space="preserve">- <value>Configuration</value>- </data>- <data name="CustomDictionaryTooSmall" xml:space="preserve">- <value>Please set at least two characters in the custom dictionary</value>- </data>- <data name="CustomFormat" xml:space="preserve">- <value>Custom format</value>- </data>- <data name="Decimal" xml:space="preserve">- <value>Decimal</value>- </data>- <data name="Description" xml:space="preserve">- <value>Convert numbers from one base to another</value>- </data>- <data name="Format" xml:space="preserve">- <value>Format number</value>- </data>- <data name="Hexadecimal" xml:space="preserve">- <value>Hexadecimal</value>- </data>- <data name="Input" xml:space="preserve">- <value>Input</value>- </data>- <data name="InputBaseOptionDescription" xml:space="preserve">- <value>The base of the number to convert</value>- </data>- <data name="InputDictionary" xml:space="preserve">- <value>Input dictionary</value>- </data>- <data name="InputOptionDescription" xml:space="preserve">- <value>Number to convert</value>- <comment>CLI parameter description</comment>- </data>- <data name="LongDisplayTitle" xml:space="preserve">- <value>Number Base Converter</value>- </data>- <data name="Octal" xml:space="preserve">- <value>Octal</value>- </data>- <data name="Output" xml:space="preserve">- <value>Output</value>- </data>- <data name="OutputBaseOptionDescription" xml:space="preserve">- <value>The desired base to convert to.</value>- </data>- <data name="OutputDictionary" xml:space="preserve">- <value>Output dictionary</value>- </data>- <data name="RFC4648Base16" xml:space="preserve">- <value>RFC-4648 Base16</value>- </data>- <data name="RFC4648Base32" xml:space="preserve">- <value>RFC-4648 Base32</value>- </data>- <data name="RFC4648Base32ExtendedHex" xml:space="preserve">- <value>RFC-4648 Base32 Extended Hex</value>- </data>- <data name="RFC4648Base64" xml:space="preserve">- <value>RFC-4648 Base64</value>- </data>- <data name="RFC4648Base64UrlEncode" xml:space="preserve">- <value>RFC-4648 Base64 Url Encode</value>- </data>- <data name="ShortDisplayTitle" xml:space="preserve">- <value>Number Base</value>- </data>- <data name="ValueInvalid" xml:space="preserve">- <value>The current {0} value isn't valid</value>- <comment>The parameter is the Base Number Type (Decimal, Octal, ...)</comment>- </data>- <data name="ValueOverflow" xml:space="preserve">- <value>The current {0} value cannot be converted as it exceeds the maximum value ({1})</value>- <comment>0 is the base number type (Decima, Octal...). 1 is the parameter is the Max value.</comment>- </data>-</root>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/Converters/NumberBase/NumberBaseConverterCommandLineTool.cs b/src/app/dev/DevToys.Tools/Tools/Converters/NumberBase/NumberBaseConverterCommandLineTool.csdeleted file mode 100644index b35c6d73a..000000000--- a/src/app/dev/DevToys.Tools/Tools/Converters/NumberBase/NumberBaseConverterCommandLineTool.cs+++ /dev/null@@ -1,88 +0,0 @@-using DevToys.Tools.Helpers;-using DevToys.Tools.Models.NumberBase;-using Microsoft.Extensions.Logging;-using Decimal = DevToys.Tools.Models.NumberBase.Decimal;--namespace DevToys.Tools.Tools.Converters.NumberBase;--[Export(typeof(ICommandLineTool))]-[Name("NumberBaseConverter")]-[CommandName(- Name = "numberbase",- Alias = "nb",- ResourceManagerBaseName = "DevToys.Tools.Tools.Converters.NumberBase.NumberBaseConverter",- DescriptionResourceName = nameof(NumberBaseConverter.Description))]-internal sealed class NumberBaseConverterCommandLineTool : ICommandLineTool-{- internal enum WellKnownNumberBases- {- Decimal,- Octal,- Hexadecimal,- Binary- }-- [CommandLineOption(- Name = "input",- Alias = "i",- IsRequired = true,- DescriptionResourceName = nameof(NumberBaseConverter.InputOptionDescription))]- internal string? Input { get; set; }-- [CommandLineOption(- Name = "base",- Alias = "b",- DescriptionResourceName = nameof(NumberBaseConverter.InputBaseOptionDescription))]- internal WellKnownNumberBases InputBase { get; set; } = WellKnownNumberBases.Decimal;-- [CommandLineOption(- Name = "outputBase",- Alias = "o",- DescriptionResourceName = nameof(NumberBaseConverter.OutputBaseOptionDescription))]- internal WellKnownNumberBases OutputBase { get; set; } = WellKnownNumberBases.Hexadecimal;-- public ValueTask<int> InvokeAsync(ILogger logger, CancellationToken cancellationToken)- {- Guard.IsNotNullOrEmpty(Input);-- INumberBaseDefinition<long> inputBaseDefinition- = InputBase switch- {- WellKnownNumberBases.Binary => Binary.Instance,- WellKnownNumberBases.Octal => Octal.Instance,- WellKnownNumberBases.Decimal => Decimal.Instance,- WellKnownNumberBases.Hexadecimal => Hexadecimal.Instance,- _ => throw new NotSupportedException()- };-- INumberBaseDefinition<long> outputBaseDefinition- = OutputBase switch- {- WellKnownNumberBases.Binary => Binary.Instance,- WellKnownNumberBases.Octal => Octal.Instance,- WellKnownNumberBases.Decimal => Decimal.Instance,- WellKnownNumberBases.Hexadecimal => Hexadecimal.Instance,- _ => throw new NotSupportedException()- };-- bool succeeded- = NumberBaseHelper.TryConvertNumberBase(- Input,- inputBaseDefinition,- outputBaseDefinition,- format: true,- out string? result,- out string? error);-- if (succeeded)- {- Console.WriteLine(result);- return ValueTask.FromResult(0);- }- else- {- Console.Error.WriteLine(error);- return ValueTask.FromResult(-1);- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Converters/NumberBase/NumberBaseConverterGuiTool.cs b/src/app/dev/DevToys.Tools/Tools/Converters/NumberBase/NumberBaseConverterGuiTool.csdeleted file mode 100644index 5ed7e9ad9..000000000--- a/src/app/dev/DevToys.Tools/Tools/Converters/NumberBase/NumberBaseConverterGuiTool.cs+++ /dev/null@@ -1,140 +0,0 @@-using DevToys.Tools.Models.NumberBase;-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.Tools.Converters.NumberBase;--[Export(typeof(IGuiTool))]-[Name("NumberBaseConverter")]-[ToolDisplayInformation(- IconFontName = "DevToys-Tools-Icons",- IconGlyph = '\u0118',- GroupName = PredefinedCommonToolGroupNames.Converters,- ResourceManagerAssemblyIdentifier = nameof(DevToysToolsResourceManagerAssemblyIdentifier),- ResourceManagerBaseName = "DevToys.Tools.Tools.Converters.NumberBase.NumberBaseConverter",- ShortDisplayTitleResourceName = nameof(NumberBaseConverter.ShortDisplayTitle),- LongDisplayTitleResourceName = nameof(NumberBaseConverter.LongDisplayTitle),- DescriptionResourceName = nameof(NumberBaseConverter.Description),- AccessibleNameResourceName = nameof(NumberBaseConverter.AccessibleName))]-[AcceptedDataTypeName("NumberBase")]-internal sealed class NumberBaseConverterGuiTool : IGuiTool-{- /// <summary>- /// Whether the value should be formatted or not.- /// </summary>- internal static readonly SettingDefinition<bool> formatted- = new(- name: $"{nameof(NumberBaseConverterGuiTool)}.{nameof(formatted)}",- defaultValue: true);-- /// <summary>- /// Whether the advanced mode should be used or not.- /// </summary>- private static readonly SettingDefinition<bool> advancedMode- = new(- name: $"{nameof(NumberBaseConverterGuiTool)}.{nameof(advancedMode)}",- defaultValue: false);-- private readonly DisposableSemaphore _semaphore = new();- private readonly ILogger _logger;- private readonly ISettingsProvider _settingsProvider;- private readonly IUIStack _modeContainer = Stack();- private readonly IUIInfoBar _infoBar = InfoBar();- private readonly Lazy<INumberBaseConverterGuiToolMode> _basicMode;- private readonly Lazy<INumberBaseConverterGuiToolMode> _advancedMode;-- private INumberBaseConverterGuiToolMode _activeMode = null!;-- [ImportingConstructor]- public NumberBaseConverterGuiTool(ISettingsProvider settingsProvider)- {- _logger = this.Log();- _settingsProvider = settingsProvider;-- _basicMode = new(() => new NumberBaseConverterGuiToolBasicMode(_settingsProvider, OnError));- _advancedMode = new(() => new NumberBaseConverterGuiToolAdvancedMode(_settingsProvider, OnError));-- ApplyMode();- }-- public UIToolView View- => new(- isScrollable: true,- Stack()- .Vertical()- .LargeSpacing()- .WithChildren(-- // Configuration- Stack()- .Vertical()- .WithChildren(-- Label().Text(NumberBaseConverter.Configuration),- Setting()- .Icon("FluentSystemIcons", '\uF7B2')- .Title(NumberBaseConverter.Format)- .Handle(- _settingsProvider,- formatted,- OnFormatOptionChanged),- Setting()- .Icon("FluentSystemIcons", '\uF1EE')- .Title(NumberBaseConverter.AdvancedMode)- .Handle(- _settingsProvider,- advancedMode,- (_) => ApplyMode())),-- _infoBar- .Close()- .NonClosable()- .Warning(),-- // Content- _modeContainer- .Vertical()));-- public void OnDataReceived(string dataTypeName, object? parsedData)- {- if (dataTypeName == "NumberBase")- {- _settingsProvider.SetSetting(advancedMode, false);- ApplyMode();-- _activeMode.OnDataReceived(parsedData);- }- }-- private void ApplyMode()- {- if (_settingsProvider.GetSetting(advancedMode))- {- _activeMode = _advancedMode.Value;- }- else- {- _activeMode = _basicMode.Value;- }-- _modeContainer.WithChildren(_activeMode.View);- }-- private void OnFormatOptionChanged(bool _)- {- Guard.IsNotNull(_activeMode);- _activeMode.OnInputChanged();- }-- private void OnError(string message)- {- if (string.IsNullOrEmpty(message))- {- _infoBar.Close();- }- else- {- _infoBar.Title(message);- _infoBar.Open();- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Converters/NumberBase/NumberBaseConverterGuiToolAdvancedMode.cs b/src/app/dev/DevToys.Tools/Tools/Converters/NumberBase/NumberBaseConverterGuiToolAdvancedMode.csdeleted file mode 100644index 514220215..000000000--- a/src/app/dev/DevToys.Tools/Tools/Converters/NumberBase/NumberBaseConverterGuiToolAdvancedMode.cs+++ /dev/null@@ -1,202 +0,0 @@-using DevToys.Tools.Helpers;-using DevToys.Tools.Models.NumberBase;--namespace DevToys.Tools.Tools.Converters.NumberBase;--internal sealed class NumberBaseConverterGuiToolAdvancedMode : INumberBaseConverterGuiToolMode-{- private readonly ISettingsProvider _settingsProvider;- private readonly Action<string> _onErrorCallback;- private readonly IUISelectDropDownList _inputDictionarySelectDropDownList = SelectDropDownList();- private readonly IUISelectDropDownList _outputDictionarySelectDropDownList = SelectDropDownList();- private readonly IUISingleLineTextInput _inputCustomFormat = SingleLineTextInput();- private readonly IUISingleLineTextInput _outputCustomFormat = SingleLineTextInput();- private readonly IUISingleLineTextInput _inputText = SingleLineTextInput();- private readonly IUISingleLineTextInput _outputText = SingleLineTextInput();-- private readonly bool _ignoreInputChanges;-- internal NumberBaseConverterGuiToolAdvancedMode(ISettingsProvider settingsProvider, Action<string> onErrorCallback)- {- Guard.IsNotNull(settingsProvider);- Guard.IsNotNull(onErrorCallback);- _settingsProvider = settingsProvider;- _onErrorCallback = onErrorCallback;-- _ignoreInputChanges = true;- InitializeInputAndOutputDictionarySelectDropDownList(_inputDictionarySelectDropDownList, OnSelectedInputDictionaryChanged);- InitializeInputAndOutputDictionarySelectDropDownList(_outputDictionarySelectDropDownList, OnSelectedOutputDictionaryChanged);- _ignoreInputChanges = false;- }-- public IUIElement View- => Stack()- .Vertical()- .LargeSpacing()- .WithChildren(-- // Input- Stack()- .Vertical()- .SmallSpacing()- .WithChildren(-- SettingGroup()- .Icon("FluentSystemIcons", '\uF2B0')- .Title(NumberBaseConverter.InputDictionary)- .InteractiveElement(_inputDictionarySelectDropDownList)- .WithChildren(- _inputCustomFormat- .Title(NumberBaseConverter.CustomFormat)- .HideCommandBar()- .OnTextChanged(OnInputTextChanged)),-- _inputText- .Title(NumberBaseConverter.Input)- .OnTextChanged(OnInputTextChanged)),-- // Output- Stack()- .Vertical()- .SmallSpacing()- .WithChildren(-- SettingGroup()- .Icon("FluentSystemIcons", '\uF2AA')- .Title(NumberBaseConverter.OutputDictionary)- .InteractiveElement(_outputDictionarySelectDropDownList)- .WithChildren(- _outputCustomFormat- .Title(NumberBaseConverter.CustomFormat)- .HideCommandBar()- .OnTextChanged(OnInputTextChanged)),-- _outputText- .Title(NumberBaseConverter.Output)- .ReadOnly()));-- public void OnDataReceived(object? parsedData)- {- throw new NotImplementedException();- }-- public void OnInputChanged()- {- if (_ignoreInputChanges)- {- return;- }-- // Retrieve the input number base definition.- INumberBaseDefinition<ulong> inputNumberBase;- if (_inputDictionarySelectDropDownList.SelectedItem?.Text == NumberBaseConverter.CustomFormat)- {- if (_inputCustomFormat.Text.Length < 2)- {- _onErrorCallback.Invoke(NumberBaseConverter.CustomDictionaryTooSmall);- _outputText.Text(string.Empty);- return;- }-- inputNumberBase = new CustomUnsigned(_inputCustomFormat.Text);- }- else- {- Guard.IsNotNull(_inputDictionarySelectDropDownList.SelectedItem);- Guard.IsNotNull(_inputDictionarySelectDropDownList.SelectedItem.Value);- Guard.IsAssignableToType(_inputDictionarySelectDropDownList.SelectedItem.Value, typeof(INumberBaseDefinition<ulong>));- inputNumberBase = (INumberBaseDefinition<ulong>)_inputDictionarySelectDropDownList.SelectedItem.Value;- }-- // Retrieve the output number base definition.- INumberBaseDefinition<ulong> outputNumberBase;- if (_outputDictionarySelectDropDownList.SelectedItem?.Text == NumberBaseConverter.CustomFormat)- {- if (_outputCustomFormat.Text.Length < 2)- {- _onErrorCallback.Invoke(NumberBaseConverter.CustomDictionaryTooSmall);- _outputText.Text(string.Empty);- return;- }-- outputNumberBase = new CustomUnsigned(_outputCustomFormat.Text);- }- else- {- Guard.IsNotNull(_outputDictionarySelectDropDownList.SelectedItem);- Guard.IsNotNull(_outputDictionarySelectDropDownList.SelectedItem.Value);- Guard.IsAssignableToType(_outputDictionarySelectDropDownList.SelectedItem.Value, typeof(INumberBaseDefinition<ulong>));- outputNumberBase = (INumberBaseDefinition<ulong>)_outputDictionarySelectDropDownList.SelectedItem.Value;- }-- // Convert the number.- bool format = _settingsProvider.GetSetting(NumberBaseConverterGuiTool.formatted);- bool succeeded- = NumberBaseHelper.TryConvertNumberBase(- _inputText.Text,- inputNumberBase,- outputNumberBase,- format,- out string result,- out string error);-- // Display result.- _onErrorCallback.Invoke(error);-- if (succeeded)- {- _outputText.Text(result);- }- else- {- _outputText.Text(string.Empty);- }- }-- private void OnInputTextChanged(string _)- {- OnInputChanged();- }-- private void OnSelectedInputDictionaryChanged()- {- if (_inputDictionarySelectDropDownList.SelectedItem?.Text == NumberBaseConverter.CustomFormat)- {- _inputCustomFormat.Enable();- }- else- {- _inputCustomFormat.Disable();- }-- OnInputChanged();- }-- private void OnSelectedOutputDictionaryChanged()- {- if (_outputDictionarySelectDropDownList.SelectedItem?.Text == NumberBaseConverter.CustomFormat)- {- _outputCustomFormat.Enable();- }- else- {- _outputCustomFormat.Disable();- }-- OnInputChanged();- }-- private static void InitializeInputAndOutputDictionarySelectDropDownList(IUISelectDropDownList selectDropDownList, Action onSelectedItemChanged)- {- selectDropDownList- .WithItems(- Item(RFC4648Base16.Instance.DisplayName, RFC4648Base16.Instance),- Item(RFC4648Base32.Instance.DisplayName, RFC4648Base32.Instance),- Item(RFC4648Base32ExtendedHex.Instance.DisplayName, RFC4648Base32ExtendedHex.Instance),- Item(RFC4648Base64.Instance.DisplayName, RFC4648Base64.Instance),- Item(RFC4648Base64UrlEncode.Instance.DisplayName, RFC4648Base64UrlEncode.Instance),- Item(NumberBaseConverter.CustomFormat, null))- .OnItemSelected((_) => onSelectedItemChanged())- .Select(0);- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Converters/NumberBase/NumberBaseConverterGuiToolBasicMode.cs b/src/app/dev/DevToys.Tools/Tools/Converters/NumberBase/NumberBaseConverterGuiToolBasicMode.csdeleted file mode 100644index 078455b9f..000000000--- a/src/app/dev/DevToys.Tools/Tools/Converters/NumberBase/NumberBaseConverterGuiToolBasicMode.cs+++ /dev/null@@ -1,175 +0,0 @@-using DevToys.Tools.Helpers;-using DevToys.Tools.Models.NumberBase;-using Decimal = DevToys.Tools.Models.NumberBase.Decimal;--namespace DevToys.Tools.Tools.Converters.NumberBase;--internal sealed class NumberBaseConverterGuiToolBasicMode : INumberBaseConverterGuiToolMode-{- private readonly ISettingsProvider _settingsProvider;- private readonly Action<string> _onErrorCallback;- private readonly IUISingleLineTextInput _hexadecimalText = SingleLineTextInput();- private readonly IUISingleLineTextInput _decimalText = SingleLineTextInput();- private readonly IUISingleLineTextInput _octalText = SingleLineTextInput();- private readonly IUISingleLineTextInput _binaryText = SingleLineTextInput();-- private bool _ignoreInputChanges;- private (string number, INumberBaseDefinition<long> baseDefinition)? _inputValue;-- internal NumberBaseConverterGuiToolBasicMode(ISettingsProvider settingsProvider, Action<string> onErrorCallback)- {- Guard.IsNotNull(settingsProvider);- Guard.IsNotNull(onErrorCallback);- _settingsProvider = settingsProvider;- _onErrorCallback = onErrorCallback;- }-- public IUIElement View- => Stack()- .Vertical()- .WithChildren(-- _hexadecimalText- .Title(NumberBaseConverter.Hexadecimal)- .OnTextChanged(OnHexadecimalChanged)- .CanCopyWhenEditable(),-- _decimalText- .Title(NumberBaseConverter.Decimal)- .OnTextChanged(OnDecimalChanged)- .CanCopyWhenEditable(),-- _octalText- .Title(NumberBaseConverter.Octal)- .OnTextChanged(OnOctalChanged)- .CanCopyWhenEditable(),-- _binaryText- .Title(NumberBaseConverter.Binary)- .OnTextChanged(OnBinaryChanged)- .CanCopyWhenEditable());-- public void OnDataReceived(object? parsedData)- {- if (parsedData is (string dataString, INumberBaseDefinition<long> numberBaseDefinition))- {- if (numberBaseDefinition == Hexadecimal.Instance)- {- _hexadecimalText.Text(dataString);- }- else if (numberBaseDefinition == Decimal.Instance)- {- _decimalText.Text(dataString);- }- else if (numberBaseDefinition == Octal.Instance)- {- _octalText.Text(dataString);- }- else if (numberBaseDefinition == Binary.Instance)- {- _binaryText.Text(dataString);- }- }- }-- public void OnInputChanged()- {- if (_ignoreInputChanges)- {- return;- }-- Guard.IsNotNull(_inputValue);-- bool format = _settingsProvider.GetSetting(NumberBaseConverterGuiTool.formatted);-- bool succeeded- = NumberBaseHelper.TryConvertNumberBase(- _inputValue.Value.number,- _inputValue.Value.baseDefinition,- format,- out string hexadecimal,- out string @decimal,- out string octal,- out string binary,- out string error);-- UpdateUI(succeeded, hexadecimal, @decimal, octal, binary, error);- }-- private void UpdateUI(- bool succeeded,- string hexadecimal,- string @decimal,- string octal,- string binary,- string error)- {- Guard.IsNotNull(_inputValue);-- _ignoreInputChanges = true;-- _onErrorCallback.Invoke(error);-- if (succeeded)- {- _hexadecimalText.Text(hexadecimal);- _decimalText.Text(@decimal);- _octalText.Text(octal);- _binaryText.Text(binary);- }- else- {- if (_inputValue.Value.baseDefinition == Hexadecimal.Instance)- {- _decimalText.Text(string.Empty);- _octalText.Text(string.Empty);- _binaryText.Text(string.Empty);- }- else if (_inputValue.Value.baseDefinition == Decimal.Instance)- {- _hexadecimalText.Text(string.Empty);- _octalText.Text(string.Empty);- _binaryText.Text(string.Empty);- }- else if (_inputValue.Value.baseDefinition == Octal.Instance)- {- _hexadecimalText.Text(string.Empty);- _decimalText.Text(string.Empty);- _binaryText.Text(string.Empty);- }- else if (_inputValue.Value.baseDefinition == Binary.Instance)- {- _hexadecimalText.Text(string.Empty);- _decimalText.Text(string.Empty);- _octalText.Text(string.Empty);- }- }-- _ignoreInputChanges = false;- }-- private void OnHexadecimalChanged(string number)- {- _inputValue = new(number, Hexadecimal.Instance);- OnInputChanged();- }-- private void OnDecimalChanged(string number)- {- _inputValue = new(number, Decimal.Instance);- OnInputChanged();- }-- private void OnOctalChanged(string number)- {- _inputValue = new(number, Octal.Instance);- OnInputChanged();- }-- private void OnBinaryChanged(string number)- {- _inputValue = new(number, Binary.Instance);- OnInputChanged();- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Image/Base64ImageEncoderDecoder.Designer.cs b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Image/Base64ImageEncoderDecoder.Designer.csdeleted file mode 100644index 64a872770..000000000--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Image/Base64ImageEncoderDecoder.Designer.cs+++ /dev/null@@ -1,153 +0,0 @@-//-------------------------------------------------------------------------------// <auto-generated>-// This code was generated by a tool.-// Runtime Version:4.0.30319.42000-//-// Changes to this file may cause incorrect behavior and will be lost if-// the code is regenerated.-// </auto-generated>-//--------------------------------------------------------------------------------namespace DevToys.Tools.Tools.EncodersDecoders.Base64Image {- using System;--- /// <summary>- /// A strongly-typed resource class, for looking up localized strings, etc.- /// </summary>- // This class was auto-generated by the StronglyTypedResourceBuilder- // class via a tool like ResGen or Visual Studio.- // To add or remove a member, edit your .ResX file then rerun ResGen- // with the /str option, or rebuild your VS project.- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]- internal class Base64ImageEncoderDecoder {-- private static global::System.Resources.ResourceManager resourceMan;-- private static global::System.Globalization.CultureInfo resourceCulture;-- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]- internal Base64ImageEncoderDecoder() {- }-- /// <summary>- /// Returns the cached ResourceManager instance used by this class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Resources.ResourceManager ResourceManager {- get {- if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Tools.Tools.EncodersDecoders.Base64Image.Base64ImageEncoderDecoder", typeof(Base64ImageEncoderDecoder).Assembly);- resourceMan = temp;- }- return resourceMan;- }- }-- /// <summary>- /// Overrides the current thread's CurrentUICulture property for all- /// resource lookups using this strongly typed resource class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Globalization.CultureInfo Culture {- get {- return resourceCulture;- }- set {- resourceCulture = value;- }- }-- /// <summary>- /// Looks up a localized string similar to Base64 Image Encoder and Decoder tool.- /// </summary>- internal static string AccessibleName {- get {- return ResourceManager.GetString("AccessibleName", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Image preview.- /// </summary>- internal static string Base64Image {- get {- return ResourceManager.GetString("Base64Image", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Base64 text.- /// </summary>- internal static string Base64Input {- get {- return ResourceManager.GetString("Base64Input", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Encode and decode Base64 image data.- /// </summary>- internal static string Description {- get {- return ResourceManager.GetString("Description", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Image file path to encode / text file path containing the Base64 to decode / Base64 text to decode.- /// </summary>- internal static string InputOptionDescription {- get {- return ResourceManager.GetString("InputOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to <Invalid Base64>.- /// </summary>- internal static string InvalidBase64 {- get {- return ResourceManager.GetString("InvalidBase64", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Base64 Image Encoder / Decoder.- /// </summary>- internal static string LongDisplayTitle {- get {- return ResourceManager.GetString("LongDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Path to the output file.- /// </summary>- internal static string OutputFileOptionDescription {- get {- return ResourceManager.GetString("OutputFileOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to RFC 4648.- /// </summary>- internal static string SearchKeywords {- get {- return ResourceManager.GetString("SearchKeywords", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Base64 Image.- /// </summary>- internal static string ShortDisplayTitle {- get {- return ResourceManager.GetString("ShortDisplayTitle", resourceCulture);- }- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Image/Base64ImageEncoderDecoder.resx b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Image/Base64ImageEncoderDecoder.resxdeleted file mode 100644index ac9f3eb18..000000000--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Image/Base64ImageEncoderDecoder.resx+++ /dev/null@@ -1,151 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<root>- <!--- Microsoft ResX Schema-- Version 2.0-- The primary goals of this format is to allow a simple XML format- that is mostly human readable. The generation and parsing of the- various data types are done through the TypeConverter classes- associated with the data types.-- Example:-- ... ado.net/XML headers & schema ...- <resheader name="resmimetype">text/microsoft-resx</resheader>- <resheader name="version">2.0</resheader>- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">- <value>[base64 mime encoded serialized .NET Framework object]</value>- </data>- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>- <comment>This is a comment</comment>- </data>-- There are any number of "resheader" rows that contain simple- name/value pairs.-- Each data row contains a name, and value. The row also contains a- type or mimetype. Type corresponds to a .NET class that support- text/value conversion through the TypeConverter architecture.- Classes that don't support this are serialized and stored with the- mimetype set.-- The mimetype is used for serialized objects, and tells the- ResXResourceReader how to depersist the object. This is currently not- extensible. For a given mimetype the value must be set accordingly:-- Note - application/x-microsoft.net.object.binary.base64 is the format- that the ResXResourceWriter will generate, however the reader can- read any of the formats listed below.-- mimetype: application/x-microsoft.net.object.binary.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.soap.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.bytearray.base64- value : The object must be serialized into a byte array- : using a System.ComponentModel.TypeConverter- : and then encoded with base64 encoding.- -->- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />- <xsd:element name="root" msdata:IsDataSet="true">- <xsd:complexType>- <xsd:choice maxOccurs="unbounded">- <xsd:element name="metadata">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" />- </xsd:sequence>- <xsd:attribute name="name" use="required" type="xsd:string" />- <xsd:attribute name="type" type="xsd:string" />- <xsd:attribute name="mimetype" type="xsd:string" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="assembly">- <xsd:complexType>- <xsd:attribute name="alias" type="xsd:string" />- <xsd:attribute name="name" type="xsd:string" />- </xsd:complexType>- </xsd:element>- <xsd:element name="data">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="resheader">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" />- </xsd:complexType>- </xsd:element>- </xsd:choice>- </xsd:complexType>- </xsd:element>- </xsd:schema>- <resheader name="resmimetype">- <value>text/microsoft-resx</value>- </resheader>- <resheader name="version">- <value>2.0</value>- </resheader>- <resheader name="reader">- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <resheader name="writer">- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <data name="AccessibleName" xml:space="preserve">- <value>Base64 Image Encoder and Decoder tool</value>- </data>- <data name="Base64Image" xml:space="preserve">- <value>Image preview</value>- </data>- <data name="Base64Input" xml:space="preserve">- <value>Base64 text</value>- </data>- <data name="Description" xml:space="preserve">- <value>Encode and decode Base64 image data</value>- </data>- <data name="InputOptionDescription" xml:space="preserve">- <value>Image file path to encode / text file path containing the Base64 to decode / Base64 text to decode</value>- </data>- <data name="InvalidBase64" xml:space="preserve">- <value><Invalid Base64></value>- </data>- <data name="LongDisplayTitle" xml:space="preserve">- <value>Base64 Image Encoder / Decoder</value>- </data>- <data name="OutputFileOptionDescription" xml:space="preserve">- <value>Path to the output file</value>- </data>- <data name="SearchKeywords" xml:space="preserve">- <value>RFC 4648</value>- <comment>Alternative search keywords.</comment>- </data>- <data name="ShortDisplayTitle" xml:space="preserve">- <value>Base64 Image</value>- </data>-</root>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Image/Base64ImageEncoderDecoderCommandLineTool.cs b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Image/Base64ImageEncoderDecoderCommandLineTool.csdeleted file mode 100644index 3455614e8..000000000--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Image/Base64ImageEncoderDecoderCommandLineTool.cs+++ /dev/null@@ -1,146 +0,0 @@-using DevToys.Tools.Helpers;-using DevToys.Tools.SmartDetection;-using DevToys.Tools.Strings.GlobalStrings;-using Microsoft.Extensions.Logging;-using OneOf;--namespace DevToys.Tools.Tools.EncodersDecoders.Base64Image;--[Export(typeof(ICommandLineTool))]-[Name("Base64ImageEncoderDecoder")]-[CommandName(- Name = "base64img",- Alias = "b64i",- ResourceManagerBaseName = "DevToys.Tools.Tools.EncodersDecoders.Base64Image.Base64ImageEncoderDecoder",- DescriptionResourceName = nameof(Base64ImageEncoderDecoder.Description))]-internal sealed partial class Base64ImageEncoderDecoderCommandLineTool : ICommandLineTool-{-#pragma warning disable IDE0044 // Add readonly modifier- [Import]- private IFileStorage _fileStorage = null!;-#pragma warning restore IDE0044 // Add readonly modifier-- [CommandLineOption(- Name = "input",- Alias = "i",- IsRequired = true,- DescriptionResourceName = nameof(Base64ImageEncoderDecoder.InputOptionDescription))]- internal OneOf<FileInfo, string>? Input { get; set; }-- [CommandLineOption(- Name = "outputFile",- Alias = "o",- DescriptionResourceName = nameof(Base64ImageEncoderDecoder.OutputFileOptionDescription))]- internal FileInfo? OutputFile { get; set; }-- public async ValueTask<int> InvokeAsync(ILogger logger, CancellationToken cancellationToken)- {- if (!Input.HasValue)- {- return -1;- }-- return await Input.Value.Match(- async file =>- {- if (!file.Exists)- {- Console.Error.WriteLine(string.Format(GlobalStrings.FileNotFound, file.FullName));- return -1;- }-- string fileExtension = file.Extension.Trim('.');- bool isImageFile = Base64ImageFileDataTypeDetector.SupportedFileTypes.Any(ext => ext.Equals(fileExtension, StringComparison.OrdinalIgnoreCase));- if (isImageFile)- {- await EncodeAsync(file, cancellationToken);- }- else- {- string base64 = await File.ReadAllTextAsync(file.FullName, cancellationToken);- return await DecodeAsync(base64, cancellationToken);- }-- return 0;- },- async base64 => await DecodeAsync(base64, cancellationToken));- }-- private async Task EncodeAsync(FileInfo file, CancellationToken cancellationToken)- {- using Stream fileStream = _fileStorage.OpenReadFile(file.FullName);- using var memoryStream = new MemoryStream();-- await fileStream.CopyToAsync(memoryStream, cancellationToken);- memoryStream.Seek(0, SeekOrigin.Begin);-- byte[] bytes = memoryStream.ToArray();- string base64 = Convert.ToBase64String(bytes);-- if (cancellationToken.IsCancellationRequested)- {- return;- }-- string output- = file.Extension.ToLowerInvariant() switch- {- ".bmp" => "data:image/bmp;base64," + base64,- ".gif" => "data:image/gif;base64," + base64,- ".ico" => "data:image/x-icon;base64," + base64,- ".jpg" or ".jpeg" => "data:image/jpeg;base64," + base64,- ".png" => "data:image/png;base64," + base64,- ".svg" => "data:image/svg+xml;base64," + base64,- ".webp" => "data:image/webp;base64," + base64,- _ => throw new NotSupportedException(),- };-- await FileHelper.WriteOutputAsync(output, OutputFile, cancellationToken);- }-- private async ValueTask<int> DecodeAsync(string input, CancellationToken cancellationToken)- {- Stream? fileStream = null;- try- {- if (string.IsNullOrWhiteSpace(input))- {- return -1;- }-- string trimmedData = input.Trim();-- input = trimmedData.Substring(trimmedData.IndexOf(',') + 1);- byte[] bytes = Convert.FromBase64String(input);-- if (OutputFile is null)- {- fileStream = await _fileStorage.PickSaveFileAsync(Base64ImageFileDataTypeDetector.SupportedFileTypes);- if (fileStream is null)- {- return -1;- }- }- else- {- if (OutputFile.Exists)- {- File.Delete(OutputFile.FullName);- }-- fileStream = OutputFile.OpenWrite();- }-- await fileStream.WriteAsync(bytes, cancellationToken);- return 0;- }- catch- {- return -1;- }- finally- {- fileStream?.Dispose();- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Image/Base64ImageEncoderDecoderGuiTool.cs b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Image/Base64ImageEncoderDecoderGuiTool.csdeleted file mode 100644index 02b9ca034..000000000--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Image/Base64ImageEncoderDecoderGuiTool.cs+++ /dev/null@@ -1,274 +0,0 @@-using DevToys.Tools.SmartDetection;-using Microsoft.Extensions.Logging;-using SixLabors.ImageSharp;--namespace DevToys.Tools.Tools.EncodersDecoders.Base64Image;--[Export(typeof(IGuiTool))]-[Name("Base64ImageEncoderDecoder")]-[ToolDisplayInformation(- IconFontName = "DevToys-Tools-Icons",- IconGlyph = '\u0102',- GroupName = PredefinedCommonToolGroupNames.EncodersDecoders,- ResourceManagerAssemblyIdentifier = nameof(DevToysToolsResourceManagerAssemblyIdentifier),- ResourceManagerBaseName = "DevToys.Tools.Tools.EncodersDecoders.Base64Image.Base64ImageEncoderDecoder",- ShortDisplayTitleResourceName = nameof(Base64ImageEncoderDecoder.ShortDisplayTitle),- LongDisplayTitleResourceName = nameof(Base64ImageEncoderDecoder.LongDisplayTitle),- DescriptionResourceName = nameof(Base64ImageEncoderDecoder.Description),- AccessibleNameResourceName = nameof(Base64ImageEncoderDecoder.AccessibleName),- SearchKeywordsResourceName = nameof(Base64ImageEncoderDecoder.SearchKeywords))]-[AcceptedDataTypeName(PredefinedCommonDataTypeNames.Base64Image)]-[AcceptedDataTypeName(PredefinedCommonDataTypeNames.Image)]-[AcceptedDataTypeName("Base64ImageFile")]-internal sealed partial class Base64ImageEncoderDecoderGuiTool : IGuiTool, IDisposable-{- private enum GridRows- {- FileInput,- ImagePreviewer- }-- private enum GridColumns- {- Stretch- }-- private readonly DisposableSemaphore _semaphore = new();- private readonly IFileStorage _fileStorage;- private readonly ILogger _logger;- private readonly IUIMultiLineTextInput _inputText = MultilineTextInput("base64-image-input-box");- private readonly IUIFileSelector _fileSelector = FileSelector("base64-image-file-selector");- private readonly IUIImageViewer _imageViewer = ImageViewer("base64-image-preview");-- private SandboxedFileReader? _selectedFile;- private CancellationTokenSource? _cancellationTokenSource;- private bool _ignoreBase64DataChange;-- [ImportingConstructor]- public Base64ImageEncoderDecoderGuiTool(IFileStorage fileStorage)- {- _fileStorage = fileStorage;- _logger = this.Log();- }-- // For unit tests.- internal Task? WorkTask { get; private set; }-- public UIToolView View- => new(- isScrollable: true,- SplitGrid()- .Vertical()- .LeftPaneLength(new UIGridLength(4, UIGridUnitType.Fraction))- .RightPaneLength(new UIGridLength(2, UIGridUnitType.Fraction))-- .WithLeftPaneChild(- _inputText- .Title(Base64ImageEncoderDecoder.Base64Input)- .AlwaysWrap()- .CanCopyWhenEditable()- .OnTextChanged(OnInputTextChanged))-- .WithRightPaneChild(- Grid()- .RowLargeSpacing()-- .Rows(- (GridRows.FileInput, Auto),- (GridRows.ImagePreviewer, new UIGridLength(1, UIGridUnitType.Fraction)))-- .Columns(- (GridColumns.Stretch, new UIGridLength(1, UIGridUnitType.Fraction)))-- .Cells(- Cell(- GridRows.FileInput,- GridColumns.Stretch,-- _fileSelector- .CanSelectOneFile()- .LimitFileTypesTo(Base64ImageFileDataTypeDetector.SupportedFileTypes)- .OnFilesSelected(OnFileSelectedAsync)),-- Cell(- GridRows.ImagePreviewer,- GridColumns.Stretch,-- _imageViewer- .Title(Base64ImageEncoderDecoder.Base64Image)))));-- public async void OnDataReceived(string dataTypeName, object? parsedData)- {- if (dataTypeName == PredefinedCommonDataTypeNames.Base64Image && parsedData is string base64Image)- {- _inputText.Text(base64Image); // This will trigger a conversion.- }- else if (dataTypeName == PredefinedCommonDataTypeNames.Image && parsedData is Image<SixLabors.ImageSharp.PixelFormats.Rgba32> image)- {- FileInfo temporaryFile = _fileStorage.CreateSelfDestroyingTempFile("png");-- using (image)- {- using Stream fileStream = _fileStorage.OpenWriteFile(temporaryFile.FullName, replaceIfExist: true);- await image.SaveAsPngAsync(fileStream);- }-- _fileSelector.WithFiles(SandboxedFileReader.FromFileInfo(temporaryFile)); // This will trigger a conversion.- }- else if (dataTypeName == "Base64ImageFile" && parsedData is FileInfo file)- {- _fileSelector.WithFiles(SandboxedFileReader.FromFileInfo(file)); // This will trigger a conversion.- }- }-- public void Dispose()- {- _selectedFile?.Dispose();- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _semaphore.Dispose();- }-- private void OnInputTextChanged(string text)- {- if (!_ignoreBase64DataChange)- {- StartConvert(text);- }- }-- private ValueTask OnFileSelectedAsync(SandboxedFileReader[] files)- {- Guard.HasSizeEqualTo(files, 1);-- _selectedFile?.Dispose();- _selectedFile = files[0];- _imageViewer.WithPickedFile(_selectedFile, false);-- StartConvert(_selectedFile);- return ValueTask.CompletedTask;- }-- private void StartConvert(SandboxedFileReader file)- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _cancellationTokenSource = new CancellationTokenSource();-- WorkTask = ConvertImageToBase64Async(file, _cancellationTokenSource.Token);- }-- private void StartConvert(string text)- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _cancellationTokenSource = new CancellationTokenSource();-- WorkTask = ConvertBase64ToImageAsync(text, _cancellationTokenSource.Token);- }-- private async Task ConvertBase64ToImageAsync(string input, CancellationToken cancellationToken)- {- await TaskSchedulerAwaiter.SwitchOffMainThreadAsync(cancellationToken);-- try- {- using (await _semaphore.WaitAsync(cancellationToken))- {- if (string.IsNullOrWhiteSpace(input))- {- _imageViewer.Clear();- return;- }-- string? trimmedData = input?.Trim();-- string fileExtension;- if (trimmedData!.StartsWith("data:image/bmp;base64,", StringComparison.OrdinalIgnoreCase))- {- fileExtension = "bmp";- }- else if (trimmedData!.StartsWith("data:image/gif;base64,", StringComparison.OrdinalIgnoreCase))- {- fileExtension = "gif";- }- else if (trimmedData!.StartsWith("data:image/x-icon;base64,", StringComparison.OrdinalIgnoreCase))- {- fileExtension = "ico";- }- else if (trimmedData!.StartsWith("data:image/jpeg;base64,", StringComparison.OrdinalIgnoreCase))- {- fileExtension = "jpeg";- }- else if (trimmedData!.StartsWith("data:image/png;base64,", StringComparison.OrdinalIgnoreCase))- {- fileExtension = "png";- }- else if (trimmedData!.StartsWith("data:image/svg+xml;base64,", StringComparison.OrdinalIgnoreCase))- {- fileExtension = "svg";- }- else if (trimmedData!.StartsWith("data:image/webp;base64,", StringComparison.OrdinalIgnoreCase))- {- fileExtension = "webp";- }- else- {- return;- }-- input = trimmedData.Substring(trimmedData.IndexOf(',') + 1);- byte[] bytes = Convert.FromBase64String(input);-- FileInfo tempFile = _fileStorage.CreateSelfDestroyingTempFile(fileExtension);- using (FileStream tempFileStream = tempFile.OpenWrite())- {- await tempFileStream.WriteAsync(bytes, cancellationToken);- }-- _imageViewer.WithFile(tempFile);- }- }- catch- {- _imageViewer.Clear();- }- }-- private async Task ConvertImageToBase64Async(SandboxedFileReader file, CancellationToken cancellationToken)- {- await TaskSchedulerAwaiter.SwitchOffMainThreadAsync(cancellationToken);-- using (await _semaphore.WaitAsync(cancellationToken))- {- using Stream stream = await file.GetNewAccessToFileContentAsync(cancellationToken);-- var bytes = new Memory<byte>(new byte[stream.Length]);- await stream.ReadAsync(bytes, CancellationToken.None);- string base64 = Convert.ToBase64String(bytes.Span);-- if (cancellationToken.IsCancellationRequested)- {- return;- }-- string fileExtension = Path.GetExtension(file.FileName);- string output- = fileExtension.ToLowerInvariant() switch- {- ".bmp" => "data:image/bmp;base64," + base64,- ".gif" => "data:image/gif;base64," + base64,- ".ico" => "data:image/x-icon;base64," + base64,- ".jpg" or ".jpeg" => "data:image/jpeg;base64," + base64,- ".png" => "data:image/png;base64," + base64,- ".svg" => "data:image/svg+xml;base64," + base64,- ".webp" => "data:image/webp;base64," + base64,- _ => throw new NotSupportedException(),- };-- _ignoreBase64DataChange = true;- _inputText.Text(output);- _ignoreBase64DataChange = false;- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Text/Base64TextEncoderDecoder.Designer.cs b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Text/Base64TextEncoderDecoder.Designer.csdeleted file mode 100644index 33c0f1e09..000000000--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Text/Base64TextEncoderDecoder.Designer.cs+++ /dev/null@@ -1,270 +0,0 @@-//-------------------------------------------------------------------------------// <auto-generated>-// This code was generated by a tool.-// Runtime Version:4.0.30319.42000-//-// Changes to this file may cause incorrect behavior and will be lost if-// the code is regenerated.-// </auto-generated>-//--------------------------------------------------------------------------------namespace DevToys.Tools.Tools.EncodersDecoders.Base64Text {- using System;--- /// <summary>- /// A strongly-typed resource class, for looking up localized strings, etc.- /// </summary>- // This class was auto-generated by the StronglyTypedResourceBuilder- // class via a tool like ResGen or Visual Studio.- // To add or remove a member, edit your .ResX file then rerun ResGen- // with the /str option, or rebuild your VS project.- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]- internal class Base64TextEncoderDecoder {-- private static global::System.Resources.ResourceManager resourceMan;-- private static global::System.Globalization.CultureInfo resourceCulture;-- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]- internal Base64TextEncoderDecoder() {- }-- /// <summary>- /// Returns the cached ResourceManager instance used by this class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Resources.ResourceManager ResourceManager {- get {- if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Tools.Tools.EncodersDecoders.Base64Text.Base64TextEncoderDecoder", typeof(Base64TextEncoderDecoder).Assembly);- resourceMan = temp;- }- return resourceMan;- }- }-- /// <summary>- /// Overrides the current thread's CurrentUICulture property for all- /// resource lookups using this strongly typed resource class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Globalization.CultureInfo Culture {- get {- return resourceCulture;- }- set {- resourceCulture = value;- }- }-- /// <summary>- /// Looks up a localized string similar to Base64 Text Encoder and Decoder tool.- /// </summary>- internal static string AccessibleName {- get {- return ResourceManager.GetString("AccessibleName", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to ASCII.- /// </summary>- internal static string Ascii {- get {- return ResourceManager.GetString("Ascii", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Configuration.- /// </summary>- internal static string ConfigurationTitle {- get {- return ResourceManager.GetString("ConfigurationTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Decode.- /// </summary>- internal static string ConversionDecode {- get {- return ResourceManager.GetString("ConversionDecode", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Select which conversion mode you want to use.- /// </summary>- internal static string ConversionDescription {- get {- return ResourceManager.GetString("ConversionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Encode.- /// </summary>- internal static string ConversionEncode {- get {- return ResourceManager.GetString("ConversionEncode", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Whether to encode or decode Base64 text.- /// </summary>- internal static string ConversionOptionDescription {- get {- return ResourceManager.GetString("ConversionOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Conversion.- /// </summary>- internal static string ConversionTitle {- get {- return ResourceManager.GetString("ConversionTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Encode and decode Base64 text data.- /// </summary>- internal static string Description {- get {- return ResourceManager.GetString("Description", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Select which encoding you want to use.- /// </summary>- internal static string EncodingDescription {- get {- return ResourceManager.GetString("EncodingDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Encoding.- /// </summary>- internal static string EncodingOptionDescription {- get {- return ResourceManager.GetString("EncodingOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Encoding.- /// </summary>- internal static string EncodingTitle {- get {- return ResourceManager.GetString("EncodingTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Input file selected doesn't exist.- /// </summary>- internal static string InputFileNotFound {- get {- return ResourceManager.GetString("InputFileNotFound", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Text or path to a file to encode or Base64 to decode.- /// </summary>- internal static string InputOptionDescription {- get {- return ResourceManager.GetString("InputOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Input.- /// </summary>- internal static string InputTitle {- get {- return ResourceManager.GetString("InputTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to <Invalid Base64>.- /// </summary>- internal static string InvalidBase64 {- get {- return ResourceManager.GetString("InvalidBase64", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Please specify an input text or an input file.- /// </summary>- internal static string InvalidInputOrFileCommand {- get {- return ResourceManager.GetString("InvalidInputOrFileCommand", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Base64 Text Encoder / Decoder.- /// </summary>- internal static string LongDisplayTitle {- get {- return ResourceManager.GetString("LongDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Path to the output file.- /// </summary>- internal static string OutputFileOptionDescription {- get {- return ResourceManager.GetString("OutputFileOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Output.- /// </summary>- internal static string OutputTitle {- get {- return ResourceManager.GetString("OutputTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to RFC 4648.- /// </summary>- internal static string SearchKeywords {- get {- return ResourceManager.GetString("SearchKeywords", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Base64 Text.- /// </summary>- internal static string ShortDisplayTitle {- get {- return ResourceManager.GetString("ShortDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to UTF-8.- /// </summary>- internal static string Utf8 {- get {- return ResourceManager.GetString("Utf8", resourceCulture);- }- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Text/Base64TextEncoderDecoder.resx b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Text/Base64TextEncoderDecoder.resxdeleted file mode 100644index 13b27e479..000000000--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Text/Base64TextEncoderDecoder.resx+++ /dev/null@@ -1,190 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<root>- <!--- Microsoft ResX Schema-- Version 2.0-- The primary goals of this format is to allow a simple XML format- that is mostly human readable. The generation and parsing of the- various data types are done through the TypeConverter classes- associated with the data types.-- Example:-- ... ado.net/XML headers & schema ...- <resheader name="resmimetype">text/microsoft-resx</resheader>- <resheader name="version">2.0</resheader>- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">- <value>[base64 mime encoded serialized .NET Framework object]</value>- </data>- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>- <comment>This is a comment</comment>- </data>-- There are any number of "resheader" rows that contain simple- name/value pairs.-- Each data row contains a name, and value. The row also contains a- type or mimetype. Type corresponds to a .NET class that support- text/value conversion through the TypeConverter architecture.- Classes that don't support this are serialized and stored with the- mimetype set.-- The mimetype is used for serialized objects, and tells the- ResXResourceReader how to depersist the object. This is currently not- extensible. For a given mimetype the value must be set accordingly:-- Note - application/x-microsoft.net.object.binary.base64 is the format- that the ResXResourceWriter will generate, however the reader can- read any of the formats listed below.-- mimetype: application/x-microsoft.net.object.binary.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.soap.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.bytearray.base64- value : The object must be serialized into a byte array- : using a System.ComponentModel.TypeConverter- : and then encoded with base64 encoding.- -->- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />- <xsd:element name="root" msdata:IsDataSet="true">- <xsd:complexType>- <xsd:choice maxOccurs="unbounded">- <xsd:element name="metadata">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" />- </xsd:sequence>- <xsd:attribute name="name" use="required" type="xsd:string" />- <xsd:attribute name="type" type="xsd:string" />- <xsd:attribute name="mimetype" type="xsd:string" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="assembly">- <xsd:complexType>- <xsd:attribute name="alias" type="xsd:string" />- <xsd:attribute name="name" type="xsd:string" />- </xsd:complexType>- </xsd:element>- <xsd:element name="data">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="resheader">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" />- </xsd:complexType>- </xsd:element>- </xsd:choice>- </xsd:complexType>- </xsd:element>- </xsd:schema>- <resheader name="resmimetype">- <value>text/microsoft-resx</value>- </resheader>- <resheader name="version">- <value>2.0</value>- </resheader>- <resheader name="reader">- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <resheader name="writer">- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <data name="AccessibleName" xml:space="preserve">- <value>Base64 Text Encoder and Decoder tool</value>- </data>- <data name="Ascii" xml:space="preserve">- <value>ASCII</value>- </data>- <data name="ConfigurationTitle" xml:space="preserve">- <value>Configuration</value>- </data>- <data name="ConversionDecode" xml:space="preserve">- <value>Decode</value>- </data>- <data name="ConversionDescription" xml:space="preserve">- <value>Select which conversion mode you want to use</value>- </data>- <data name="ConversionEncode" xml:space="preserve">- <value>Encode</value>- </data>- <data name="ConversionOptionDescription" xml:space="preserve">- <value>Whether to encode or decode Base64 text</value>- </data>- <data name="ConversionTitle" xml:space="preserve">- <value>Conversion</value>- </data>- <data name="Description" xml:space="preserve">- <value>Encode and decode Base64 text data</value>- </data>- <data name="EncodingDescription" xml:space="preserve">- <value>Select which encoding you want to use</value>- </data>- <data name="EncodingOptionDescription" xml:space="preserve">- <value>Encoding</value>- </data>- <data name="EncodingTitle" xml:space="preserve">- <value>Encoding</value>- </data>- <data name="InputFileNotFound" xml:space="preserve">- <value>Input file selected doesn't exist</value>- </data>- <data name="InputOptionDescription" xml:space="preserve">- <value>Text or path to a file to encode or Base64 to decode</value>- </data>- <data name="InputTitle" xml:space="preserve">- <value>Input</value>- </data>- <data name="InvalidBase64" xml:space="preserve">- <value><Invalid Base64></value>- </data>- <data name="InvalidInputOrFileCommand" xml:space="preserve">- <value>Please specify an input text or an input file</value>- </data>- <data name="LongDisplayTitle" xml:space="preserve">- <value>Base64 Text Encoder / Decoder</value>- </data>- <data name="OutputFileOptionDescription" xml:space="preserve">- <value>Path to the output file</value>- </data>- <data name="OutputTitle" xml:space="preserve">- <value>Output</value>- </data>- <data name="SearchKeywords" xml:space="preserve">- <value>RFC 4648</value>- <comment>Alternative search keywords.</comment>- </data>- <data name="ShortDisplayTitle" xml:space="preserve">- <value>Base64 Text</value>- </data>- <data name="Utf8" xml:space="preserve">- <value>UTF-8</value>- </data>-</root>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Text/Base64TextEncoderDecoderCommandLineTool.cs b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Text/Base64TextEncoderDecoderCommandLineTool.csdeleted file mode 100644index b6f3e71d3..000000000--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Text/Base64TextEncoderDecoderCommandLineTool.cs+++ /dev/null@@ -1,92 +0,0 @@-using DevToys.Tools.Helpers;-using DevToys.Tools.Models;-using Microsoft.Extensions.Logging;-using OneOf;--namespace DevToys.Tools.Tools.EncodersDecoders.Base64Text;--[Export(typeof(ICommandLineTool))]-[Name("Base64TextEncoderDecoder")]-[CommandName(- Name = "base64",- Alias = "b64",- ResourceManagerBaseName = "DevToys.Tools.Tools.EncodersDecoders.Base64Text.Base64TextEncoderDecoder",- DescriptionResourceName = nameof(Base64TextEncoderDecoder.Description))]-internal sealed class Base64TextEncoderDecoderCommandLineTool : ICommandLineTool-{-#pragma warning disable IDE0044 // Add readonly modifier- [Import]- private IFileStorage _fileStorage = null!;-#pragma warning restore IDE0044 // Add readonly modifier-- [CommandLineOption(- Name = "input",- Alias = "i",- IsRequired = true,- DescriptionResourceName = nameof(Base64TextEncoderDecoder.InputOptionDescription))]- private OneOf<FileInfo, string>? Input { get; set; }-- [CommandLineOption(- Name = "outputFile",- Alias = "o",- DescriptionResourceName = nameof(Base64TextEncoderDecoder.OutputFileOptionDescription))]- internal FileInfo? OutputFile { get; set; }-- [CommandLineOption(- Name = "conversion",- Alias = "c",- DescriptionResourceName = nameof(Base64TextEncoderDecoder.ConversionOptionDescription))]- private EncodingConversion EncodingConversionMode { get; set; } = EncodingConversion.Encode;-- [CommandLineOption(- Name = "encoding",- Alias = "e",- DescriptionResourceName = nameof(Base64TextEncoderDecoder.EncodingOptionDescription))]- private Base64Encoding EncodingMode { get; set; } = Base64Encoding.Utf8;-- public async ValueTask<int> InvokeAsync(ILogger logger, CancellationToken cancellationToken)- {- ResultInfo<string> result;- if (!Input.HasValue)- {- Console.Error.WriteLine(Base64TextEncoderDecoder.InvalidInputOrFileCommand);- return -1;- }-- result = await Input.Value.ReadAllTextAsync(_fileStorage, cancellationToken);- if (!result.HasSucceeded)- {- Console.Error.WriteLine(Base64TextEncoderDecoder.InputFileNotFound);- return -1;- }-- Guard.IsNotNull(result.Data);-- string output;- switch (EncodingConversionMode)- {- case EncodingConversion.Encode:- output = Base64Helper.FromTextToBase64(result.Data, EncodingMode, logger, cancellationToken);- break;-- case EncodingConversion.Decode:- if (!Base64Helper.IsBase64DataStrict(result.Data))- {- cancellationToken.ThrowIfCancellationRequested();- Console.Error.WriteLine(Base64TextEncoderDecoder.InvalidBase64);- return -1;- }-- output = Base64Helper.FromBase64ToText(result.Data, EncodingMode, logger, cancellationToken);- break;-- default:- throw new NotSupportedException();- }-- cancellationToken.ThrowIfCancellationRequested();-- await FileHelper.WriteOutputAsync(output, OutputFile, cancellationToken);- return 0;- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Text/Base64TextEncoderDecoderGuiTool.cs b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Text/Base64TextEncoderDecoderGuiTool.csdeleted file mode 100644index b4b766c52..000000000--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Text/Base64TextEncoderDecoderGuiTool.cs+++ /dev/null@@ -1,262 +0,0 @@-using DevToys.Tools.Helpers;-using DevToys.Tools.Models;-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.Tools.EncodersDecoders.Base64Text;--[Export(typeof(IGuiTool))]-[Name("Base64TextEncoderDecoder")]-[ToolDisplayInformation(- IconFontName = "DevToys-Tools-Icons",- IconGlyph = '\u0100',- GroupName = PredefinedCommonToolGroupNames.EncodersDecoders,- ResourceManagerAssemblyIdentifier = nameof(DevToysToolsResourceManagerAssemblyIdentifier),- ResourceManagerBaseName = "DevToys.Tools.Tools.EncodersDecoders.Base64Text.Base64TextEncoderDecoder",- ShortDisplayTitleResourceName = nameof(Base64TextEncoderDecoder.ShortDisplayTitle),- LongDisplayTitleResourceName = nameof(Base64TextEncoderDecoder.LongDisplayTitle),- DescriptionResourceName = nameof(Base64TextEncoderDecoder.Description),- AccessibleNameResourceName = nameof(Base64TextEncoderDecoder.AccessibleName),- SearchKeywordsResourceName = nameof(Base64TextEncoderDecoder.SearchKeywords))]-[AcceptedDataTypeName(PredefinedCommonDataTypeNames.Base64Text)]-[AcceptedDataTypeName(PredefinedCommonDataTypeNames.Text)]-internal sealed partial class Base64TextEncoderDecoderGuiTool : IGuiTool, IDisposable-{- /// <summary>- /// Whether the tool should encode or decode Base64.- /// </summary>- private static readonly SettingDefinition<EncodingConversion> conversionMode- = new(- name: $"{nameof(Base64TextEncoderDecoderGuiTool)}.{nameof(conversionMode)}",- defaultValue: EncodingConversion.Encode);-- /// <summary>- /// Whether the tool should encode/decode in Unicode or ASCII.- /// </summary>- private static readonly SettingDefinition<Base64Encoding> encoder- = new(- name: $"{nameof(Base64TextEncoderDecoderGuiTool)}.{nameof(encoder)}",- defaultValue: DefaultEncoding);-- private enum GridRows- {- Settings,- Input,- Output- }-- private enum GridColumns- {- Stretch- }-- private const Base64Encoding DefaultEncoding = Base64Encoding.Utf8;-- private readonly DisposableSemaphore _semaphore = new();- private readonly ILogger _logger;- private readonly ISettingsProvider _settingsProvider;- private readonly IUISwitch _conversionModeSwitch = Switch("base64-text-conversion-mode-switch");- private readonly IUIMultiLineTextInput _inputText = MultilineTextInput("base64-text-input-box");- private readonly IUIMultiLineTextInput _outputText = MultilineTextInput("base64-text-output-box");-- private CancellationTokenSource? _cancellationTokenSource;-- [ImportingConstructor]- public Base64TextEncoderDecoderGuiTool(ISettingsProvider settingsProvider)- {- _logger = this.Log();- _settingsProvider = settingsProvider;-- switch (_settingsProvider.GetSetting(conversionMode))- {- case EncodingConversion.Encode:- _conversionModeSwitch.On();- _inputText.AutoWrap();- _outputText.AlwaysWrap();- break;-- case EncodingConversion.Decode:- _inputText.AlwaysWrap();- _outputText.AutoWrap();- break;-- default:- throw new NotSupportedException();- }- }-- // For unit tests.- internal Task? WorkTask { get; private set; }-- public UIToolView View- => new(- isScrollable: true,- Grid()- .RowLargeSpacing()-- .Rows(- (GridRows.Settings, Auto),- (GridRows.Input, new UIGridLength(1, UIGridUnitType.Fraction)),- (GridRows.Output, new UIGridLength(1, UIGridUnitType.Fraction)))-- .Columns(- (GridColumns.Stretch, new UIGridLength(1, UIGridUnitType.Fraction)))-- .Cells(- Cell(- GridRows.Settings,- GridColumns.Stretch,-- Stack()- .Vertical()- .SmallSpacing()-- .WithChildren(- Label()- .Text(Base64TextEncoderDecoder.ConfigurationTitle),-- SettingGroup("base64-text-conversion-mode-setting")- .Icon("FluentSystemIcons", '\uF18D')- .Title(Base64TextEncoderDecoder.ConversionTitle)- .Description(Base64TextEncoderDecoder.ConversionDescription)-- .InteractiveElement(- _conversionModeSwitch- .OnText(Base64TextEncoderDecoder.ConversionEncode)- .OffText(Base64TextEncoderDecoder.ConversionDecode)- .OnToggle(OnConversionModeChanged))-- .WithSettings(- Setting("base64-text-encoding-setting")- .Title(Base64TextEncoderDecoder.EncodingTitle)- .Description(Base64TextEncoderDecoder.EncodingDescription)-- .Handle(- _settingsProvider,- encoder,- onOptionSelected: OnEncodingModeChanged,- Item(Base64TextEncoderDecoder.Utf8, Base64Encoding.Utf8),- Item(Base64TextEncoderDecoder.Ascii, Base64Encoding.Ascii))))),-- Cell(- GridRows.Input,- GridColumns.Stretch,-- _inputText- .Title(Base64TextEncoderDecoder.InputTitle)- .OnTextChanged(OnInputTextChanged)),-- Cell(- GridRows.Output,- GridColumns.Stretch,-- _outputText- .Title(Base64TextEncoderDecoder.OutputTitle)- .ReadOnly()- .Extendable())));-- public void OnDataReceived(string dataTypeName, object? parsedData)- {- if (dataTypeName == PredefinedCommonDataTypeNames.Base64Text && parsedData is string base64Text)- {- _conversionModeSwitch.Off(); // Switch to Decode mode- _inputText.Text(base64Text); // This will trigger a conversion.- }- else if (dataTypeName == PredefinedCommonDataTypeNames.Text && parsedData is string text)- {- _conversionModeSwitch.On(); // Switch to Encode mode- _inputText.Text(text); // This will trigger a conversion.- }- }-- public void Dispose()- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _semaphore.Dispose();- }-- private void OnConversionModeChanged(bool conversionMode)- {- _settingsProvider.SetSetting(Base64TextEncoderDecoderGuiTool.conversionMode, conversionMode ? EncodingConversion.Encode : EncodingConversion.Decode);- _inputText.Text(_outputText.Text); // This will trigger a conversion.-- switch (_settingsProvider.GetSetting(Base64TextEncoderDecoderGuiTool.conversionMode))- {- case EncodingConversion.Encode:- _inputText.AutoWrap();- _outputText.AlwaysWrap();- break;-- case EncodingConversion.Decode:- _inputText.AlwaysWrap();- _outputText.AutoWrap();- break;-- default:- throw new NotSupportedException();- }- }-- private void OnEncodingModeChanged(Base64Encoding encodingMode)- {- StartConvert(_inputText.Text);- }-- private void OnInputTextChanged(string text)- {- StartConvert(text);- }-- private void StartConvert(string text)- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _cancellationTokenSource = new CancellationTokenSource();-- WorkTask = ConvertAsync(text, _settingsProvider.GetSetting(encoder), _cancellationTokenSource.Token);- }-- private async Task ConvertAsync(string input, Base64Encoding encoderSetting, CancellationToken cancellationToken)- {- using (await _semaphore.WaitAsync(cancellationToken))- {- await TaskSchedulerAwaiter.SwitchOffMainThreadAsync(cancellationToken);-- string conversionResult;-- switch (_settingsProvider.GetSetting(conversionMode))- {- case EncodingConversion.Encode:- conversionResult- = Base64Helper.FromTextToBase64(- input,- encoderSetting,- _logger,- cancellationToken);- break;-- case EncodingConversion.Decode:- if (!string.IsNullOrEmpty(input) && !Base64Helper.IsBase64DataStrict(input))- {- cancellationToken.ThrowIfCancellationRequested();- _outputText.Text(Base64TextEncoderDecoder.InvalidBase64);- return;- }-- conversionResult- = Base64Helper.FromBase64ToText(- input,- encoderSetting,- _logger,- cancellationToken);- break;-- default:- throw new NotSupportedException();- }-- cancellationToken.ThrowIfCancellationRequested();- _outputText.Text(conversionResult);- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Certificate/CertificateDecoder.Designer.cs b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Certificate/CertificateDecoder.Designer.csdeleted file mode 100644index 89497cf5b..000000000--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Certificate/CertificateDecoder.Designer.cs+++ /dev/null@@ -1,198 +0,0 @@-//-------------------------------------------------------------------------------// <auto-generated>-// This code was generated by a tool.-// Runtime Version:4.0.30319.42000-//-// Changes to this file may cause incorrect behavior and will be lost if-// the code is regenerated.-// </auto-generated>-//--------------------------------------------------------------------------------namespace DevToys.Tools.Tools.EncodersDecoders.Certificate {- using System;--- /// <summary>- /// A strongly-typed resource class, for looking up localized strings, etc.- /// </summary>- // This class was auto-generated by the StronglyTypedResourceBuilder- // class via a tool like ResGen or Visual Studio.- // To add or remove a member, edit your .ResX file then rerun ResGen- // with the /str option, or rebuild your VS project.- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]- internal class CertificateDecoder {-- private static global::System.Resources.ResourceManager resourceMan;-- private static global::System.Globalization.CultureInfo resourceCulture;-- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]- internal CertificateDecoder() {- }-- /// <summary>- /// Returns the cached ResourceManager instance used by this class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Resources.ResourceManager ResourceManager {- get {- if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Tools.Tools.EncodersDecoders.Certificate.CertificateDecoder", typeof(CertificateDecoder).Assembly);- resourceMan = temp;- }- return resourceMan;- }- }-- /// <summary>- /// Overrides the current thread's CurrentUICulture property for all- /// resource lookups using this strongly typed resource class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Globalization.CultureInfo Culture {- get {- return resourceCulture;- }- set {- resourceCulture = value;- }- }-- /// <summary>- /// Looks up a localized string similar to Certificate Decoder tool.- /// </summary>- internal static string AccessibleName {- get {- return ResourceManager.GetString("AccessibleName", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Decode a certificate.- /// </summary>- internal static string Description {- get {- return ResourceManager.GetString("Description", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Input file selected doesn't exist.- /// </summary>- internal static string InputFileNotFound {- get {- return ResourceManager.GetString("InputFileNotFound", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Raw certificate text or path to a certificate file to decode.- /// </summary>- internal static string InputOptionDescription {- get {- return ResourceManager.GetString("InputOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Input.- /// </summary>- internal static string InputTitle {- get {- return ResourceManager.GetString("InputTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Please specify an input text or an input file.- /// </summary>- internal static string InvalidInputOrFileCommand {- get {- return ResourceManager.GetString("InvalidInputOrFileCommand", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Invalid password..- /// </summary>- internal static string InvalidPasswordError {- get {- return ResourceManager.GetString("InvalidPasswordError", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Certificate Decoder.- /// </summary>- internal static string LongDisplayTitle {- get {- return ResourceManager.GetString("LongDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Path to the output file.- /// </summary>- internal static string OutputFileOptionDescription {- get {- return ResourceManager.GetString("OutputFileOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Output.- /// </summary>- internal static string OutputTitle {- get {- return ResourceManager.GetString("OutputTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Certificate password.- /// </summary>- internal static string PasswordOptionDescription {- get {- return ResourceManager.GetString("PasswordOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Password.- /// </summary>- internal static string PasswordTitle {- get {- return ResourceManager.GetString("PasswordTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to CER PFX PEM CRT.- /// </summary>- internal static string SearchKeywords {- get {- return ResourceManager.GetString("SearchKeywords", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Certificate.- /// </summary>- internal static string ShortDisplayTitle {- get {- return ResourceManager.GetString("ShortDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Certificate Request format not currently supported..- /// </summary>- internal static string UnsupportedFormatError {- get {- return ResourceManager.GetString("UnsupportedFormatError", resourceCulture);- }- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Certificate/CertificateDecoder.resx b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Certificate/CertificateDecoder.resxdeleted file mode 100644index c4997f7a2..000000000--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Certificate/CertificateDecoder.resx+++ /dev/null@@ -1,166 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<root>- <!--- Microsoft ResX Schema-- Version 2.0-- The primary goals of this format is to allow a simple XML format- that is mostly human readable. The generation and parsing of the- various data types are done through the TypeConverter classes- associated with the data types.-- Example:-- ... ado.net/XML headers & schema ...- <resheader name="resmimetype">text/microsoft-resx</resheader>- <resheader name="version">2.0</resheader>- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">- <value>[base64 mime encoded serialized .NET Framework object]</value>- </data>- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>- <comment>This is a comment</comment>- </data>-- There are any number of "resheader" rows that contain simple- name/value pairs.-- Each data row contains a name, and value. The row also contains a- type or mimetype. Type corresponds to a .NET class that support- text/value conversion through the TypeConverter architecture.- Classes that don't support this are serialized and stored with the- mimetype set.-- The mimetype is used for serialized objects, and tells the- ResXResourceReader how to depersist the object. This is currently not- extensible. For a given mimetype the value must be set accordingly:-- Note - application/x-microsoft.net.object.binary.base64 is the format- that the ResXResourceWriter will generate, however the reader can- read any of the formats listed below.-- mimetype: application/x-microsoft.net.object.binary.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.soap.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.bytearray.base64- value : The object must be serialized into a byte array- : using a System.ComponentModel.TypeConverter- : and then encoded with base64 encoding.- -->- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />- <xsd:element name="root" msdata:IsDataSet="true">- <xsd:complexType>- <xsd:choice maxOccurs="unbounded">- <xsd:element name="metadata">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" />- </xsd:sequence>- <xsd:attribute name="name" use="required" type="xsd:string" />- <xsd:attribute name="type" type="xsd:string" />- <xsd:attribute name="mimetype" type="xsd:string" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="assembly">- <xsd:complexType>- <xsd:attribute name="alias" type="xsd:string" />- <xsd:attribute name="name" type="xsd:string" />- </xsd:complexType>- </xsd:element>- <xsd:element name="data">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="resheader">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" />- </xsd:complexType>- </xsd:element>- </xsd:choice>- </xsd:complexType>- </xsd:element>- </xsd:schema>- <resheader name="resmimetype">- <value>text/microsoft-resx</value>- </resheader>- <resheader name="version">- <value>2.0</value>- </resheader>- <resheader name="reader">- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <resheader name="writer">- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <data name="AccessibleName" xml:space="preserve">- <value>Certificate Decoder tool</value>- </data>- <data name="Description" xml:space="preserve">- <value>Decode a certificate</value>- </data>- <data name="InputFileNotFound" xml:space="preserve">- <value>Input file selected doesn't exist</value>- </data>- <data name="InputOptionDescription" xml:space="preserve">- <value>Raw certificate text or path to a certificate file to decode</value>- </data>- <data name="InputTitle" xml:space="preserve">- <value>Input</value>- </data>- <data name="InvalidInputOrFileCommand" xml:space="preserve">- <value>Please specify an input text or an input file</value>- </data>- <data name="InvalidPasswordError" xml:space="preserve">- <value>Invalid password.</value>- </data>- <data name="LongDisplayTitle" xml:space="preserve">- <value>Certificate Decoder</value>- </data>- <data name="OutputFileOptionDescription" xml:space="preserve">- <value>Path to the output file</value>- </data>- <data name="OutputTitle" xml:space="preserve">- <value>Output</value>- </data>- <data name="PasswordOptionDescription" xml:space="preserve">- <value>Certificate password</value>- </data>- <data name="PasswordTitle" xml:space="preserve">- <value>Password</value>- </data>- <data name="SearchKeywords" xml:space="preserve">- <value>CER PFX PEM CRT</value>- <comment>Alternative search keywords.</comment>- </data>- <data name="ShortDisplayTitle" xml:space="preserve">- <value>Certificate</value>- </data>- <data name="UnsupportedFormatError" xml:space="preserve">- <value>Certificate Request format not currently supported.</value>- </data>-</root>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Certificate/CertificateDecoderCommandLineTool.cs b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Certificate/CertificateDecoderCommandLineTool.csdeleted file mode 100644index 09b22d804..000000000--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Certificate/CertificateDecoderCommandLineTool.cs+++ /dev/null@@ -1,100 +0,0 @@-using DevToys.Tools.Helpers;-using Microsoft.Extensions.Logging;-using OneOf;--namespace DevToys.Tools.Tools.EncodersDecoders.Certificate;--[Export(typeof(ICommandLineTool))]-[Name("CertificateDecoder")]-[CommandName(- Name = "certificate",- Alias = "cert",- ResourceManagerBaseName = "DevToys.Tools.Tools.EncodersDecoders.Certificate.CertificateDecoder",- DescriptionResourceName = nameof(CertificateDecoder.Description))]-internal sealed class CertificateDecoderCommandLineTool : ICommandLineTool-{-#pragma warning disable IDE0044 // Add readonly modifier- [Import]- private IFileStorage _fileStorage = null!;-#pragma warning restore IDE0044 // Add readonly modifier-- [CommandLineOption(- Name = "input",- Alias = "i",- IsRequired = true,- DescriptionResourceName = nameof(CertificateDecoder.InputOptionDescription))]- internal OneOf<FileInfo, string>? Input { get; set; }-- [CommandLineOption(- Name = "pwd",- Alias = "p",- DescriptionResourceName = nameof(CertificateDecoder.InputOptionDescription))]- internal string? Password { get; set; }-- [CommandLineOption(- Name = "outputFile",- Alias = "o",- DescriptionResourceName = nameof(CertificateDecoder.OutputFileOptionDescription))]- private FileInfo? OutputFile { get; set; }-- public async ValueTask<int> InvokeAsync(ILogger logger, CancellationToken cancellationToken)- {- if (!Input.HasValue)- {- Console.Error.WriteLine(CertificateDecoder.InvalidInputOrFileCommand);- return -1;- }-- ResultInfo<string> result- = await Input.Value.Match(- async inputFile =>- {- if (!_fileStorage.FileExists(inputFile.FullName))- {- return new ResultInfo<string>("", false);- }-- using Stream fileStream = _fileStorage.OpenReadFile(inputFile.FullName);- using var memStream = new MemoryStream();- await fileStream.CopyToAsync(memStream, cancellationToken);- byte[] bytes = memStream.ToArray();-- string rawCertificateString = CertificateHelper.GetRawCertificateString(bytes);-- return new ResultInfo<string>(rawCertificateString, true);- },- inputString => Task.FromResult(new ResultInfo<string>(inputString, true)));-- if (!result.HasSucceeded)- {- Console.Error.WriteLine(CertificateDecoder.InputFileNotFound);- return -1;- }-- Guard.IsNotNull(result.Data);-- string? decoded = null;- bool success = false;- if (!string.IsNullOrWhiteSpace(result.Data))- {- success = CertificateHelper.TryDecodeCertificate(- logger,- result.Data,- Password,- out decoded);- }-- cancellationToken.ThrowIfCancellationRequested();-- if (success)- {- await FileHelper.WriteOutputAsync(decoded ?? string.Empty, OutputFile, cancellationToken);- return 0;- }- else- {- Console.Error.WriteLine(decoded);- return -1;- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Certificate/CertificateDecoderGuiTool.cs b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Certificate/CertificateDecoderGuiTool.csdeleted file mode 100644index 3e1691e41..000000000--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Certificate/CertificateDecoderGuiTool.cs+++ /dev/null@@ -1,163 +0,0 @@-using DevToys.Tools.Helpers;-using DevToys.Tools.SmartDetection;--namespace DevToys.Tools.Tools.EncodersDecoders.Certificate;--[Export(typeof(IGuiTool))]-[Name("CertificateDecoder")]-[ToolDisplayInformation(- IconFontName = "DevToys-Tools-Icons",- IconGlyph = '\u0135',- GroupName = PredefinedCommonToolGroupNames.EncodersDecoders,- ResourceManagerAssemblyIdentifier = nameof(DevToysToolsResourceManagerAssemblyIdentifier),- ResourceManagerBaseName = "DevToys.Tools.Tools.EncodersDecoders.Certificate.CertificateDecoder",- ShortDisplayTitleResourceName = nameof(CertificateDecoder.ShortDisplayTitle),- LongDisplayTitleResourceName = nameof(CertificateDecoder.LongDisplayTitle),- DescriptionResourceName = nameof(CertificateDecoder.Description),- AccessibleNameResourceName = nameof(CertificateDecoder.AccessibleName),- SearchKeywordsResourceName = nameof(CertificateDecoder.SearchKeywords))]-[AcceptedDataTypeName(CertificateDetector.InternalName)]-internal sealed class CertificateDecoderGuiTool : IGuiTool, IDisposable-{- private enum GridRows- {- TopAuto,- Stretch,- }-- private enum GridColumns- {- Stretch- }-- private readonly DisposableSemaphore _semaphore = new();- private readonly IUIPasswordInput _password = PasswordInput("certificate-decoder-password-input");- private readonly IUIFileSelector _fileSelector = FileSelector("certificate-decoder-file-selector");- private readonly IUIMultiLineTextInput _inputText = MultilineTextInput("certificate-decoder-input");- private readonly IUIMultiLineTextInput _outputText = MultilineTextInput("certificate-decoder-output");-- private CancellationTokenSource? _cancellationTokenSource;-- // For unit tests.- internal Task? WorkTask { get; private set; }-- public UIToolView View- => new(- isScrollable: false,- SplitGrid()- .Vertical()- .LeftPaneLength(new UIGridLength(1, UIGridUnitType.Fraction))- .RightPaneLength(new UIGridLength(1, UIGridUnitType.Fraction))-- .WithLeftPaneChild(- Grid()- .ColumnSmallSpacing()-- .Rows(- (GridRows.TopAuto, Auto),- (GridRows.Stretch, new UIGridLength(1, UIGridUnitType.Fraction)))-- .Columns(- (GridColumns.Stretch, new UIGridLength(1, UIGridUnitType.Fraction)))-- .Cells(- Cell(- GridRows.TopAuto,- GridColumns.Stretch,-- Stack()- .Vertical()- .LargeSpacing()- .WithChildren(-- _password- .Title(CertificateDecoder.PasswordTitle)- .OnTextChanged(OnPasswordChanged),-- _fileSelector- .CanSelectOneFile()- .LimitFileTypesTo("pem", "crt", "pfx", "cer")- .OnFilesSelected(OnFileSelectedAsync))),-- Cell(- GridRows.Stretch,- GridColumns.Stretch,-- _inputText- .Title(CertificateDecoder.InputTitle)- .CanCopyWhenEditable()- .AlwaysWrap()- .OnTextChanged(OnInputTextChanged))))-- .WithRightPaneChild(- _outputText- .ReadOnly()- .Extendable()- .Title(CertificateDecoder.OutputTitle)));-- public void OnDataReceived(string dataTypeName, object? parsedData)- {- if (dataTypeName == CertificateDetector.InternalName && parsedData is string text)- {- _inputText.Text(text); // This will trigger a decoding task.- }- }-- public void Dispose()- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _semaphore.Dispose();- }-- private async ValueTask OnFileSelectedAsync(SandboxedFileReader[] files)- {- Guard.HasSizeEqualTo(files, 1);-- using SandboxedFileReader selectedFile = files[0];- using var memStream = new MemoryStream();-- await selectedFile.CopyFileContentToAsync(memStream, CancellationToken.None);-- byte[] bytes = memStream.ToArray();- string rawCertificateString = CertificateHelper.GetRawCertificateString(bytes);-- _inputText.Text(rawCertificateString); // This will trigger a decoding task.- }-- private void OnInputTextChanged(string text)- {- StartDecoding();- }-- private void OnPasswordChanged(string text)- {- StartDecoding();- }-- private void StartDecoding()- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _cancellationTokenSource = new CancellationTokenSource();-- WorkTask = DecodeAsync(_inputText.Text, _password.Text, _cancellationTokenSource.Token);- }-- private async Task DecodeAsync(string rawCertificateString, string password, CancellationToken cancellationToken)- {- await TaskSchedulerAwaiter.SwitchOffMainThreadAsync(cancellationToken);-- string? decoded = null;- if (!string.IsNullOrWhiteSpace(rawCertificateString))- {- CertificateHelper.TryDecodeCertificate(- this.Log(),- rawCertificateString,- password,- out decoded);- }-- _outputText.Text(decoded ?? string.Empty);- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/EncodersDecoders.Designer.cs b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/EncodersDecoders.Designer.csdeleted file mode 100644index 04ed99695..000000000--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/EncodersDecoders.Designer.cs+++ /dev/null@@ -1,81 +0,0 @@-//-------------------------------------------------------------------------------// <auto-generated>-// This code was generated by a tool.-// Runtime Version:4.0.30319.42000-//-// Changes to this file may cause incorrect behavior and will be lost if-// the code is regenerated.-// </auto-generated>-//--------------------------------------------------------------------------------namespace DevToys.Tools.Tools.EncodersDecoders {- using System;--- /// <summary>- /// A strongly-typed resource class, for looking up localized strings, etc.- /// </summary>- // This class was auto-generated by the StronglyTypedResourceBuilder- // class via a tool like ResGen or Visual Studio.- // To add or remove a member, edit your .ResX file then rerun ResGen- // with the /str option, or rebuild your VS project.- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]- internal class EncodersDecoders {-- private static global::System.Resources.ResourceManager resourceMan;-- private static global::System.Globalization.CultureInfo resourceCulture;-- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]- internal EncodersDecoders() {- }-- /// <summary>- /// Returns the cached ResourceManager instance used by this class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Resources.ResourceManager ResourceManager {- get {- if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Tools.Tools.EncodersDecoders.EncodersDecoders", typeof(EncodersDecoders).Assembly);- resourceMan = temp;- }- return resourceMan;- }- }-- /// <summary>- /// Overrides the current thread's CurrentUICulture property for all- /// resource lookups using this strongly typed resource class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Globalization.CultureInfo Culture {- get {- return resourceCulture;- }- set {- resourceCulture = value;- }- }-- /// <summary>- /// Looks up a localized string similar to Encoders and decoders.- /// </summary>- internal static string AccessibleName {- get {- return ResourceManager.GetString("AccessibleName", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Encoders / Decoders.- /// </summary>- internal static string DisplayTitle {- get {- return ResourceManager.GetString("DisplayTitle", resourceCulture);- }- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/EncodersDecoders.resx b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/EncodersDecoders.resxdeleted file mode 100644index e57e697d9..000000000--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/EncodersDecoders.resx+++ /dev/null@@ -1,126 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<root>- <!--- Microsoft ResX Schema-- Version 2.0-- The primary goals of this format is to allow a simple XML format- that is mostly human readable. The generation and parsing of the- various data types are done through the TypeConverter classes- associated with the data types.-- Example:-- ... ado.net/XML headers & schema ...- <resheader name="resmimetype">text/microsoft-resx</resheader>- <resheader name="version">2.0</resheader>- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">- <value>[base64 mime encoded serialized .NET Framework object]</value>- </data>- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>- <comment>This is a comment</comment>- </data>-- There are any number of "resheader" rows that contain simple- name/value pairs.-- Each data row contains a name, and value. The row also contains a- type or mimetype. Type corresponds to a .NET class that support- text/value conversion through the TypeConverter architecture.- Classes that don't support this are serialized and stored with the- mimetype set.-- The mimetype is used for serialized objects, and tells the- ResXResourceReader how to depersist the object. This is currently not- extensible. For a given mimetype the value must be set accordingly:-- Note - application/x-microsoft.net.object.binary.base64 is the format- that the ResXResourceWriter will generate, however the reader can- read any of the formats listed below.-- mimetype: application/x-microsoft.net.object.binary.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.soap.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.bytearray.base64- value : The object must be serialized into a byte array- : using a System.ComponentModel.TypeConverter- : and then encoded with base64 encoding.- -->- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />- <xsd:element name="root" msdata:IsDataSet="true">- <xsd:complexType>- <xsd:choice maxOccurs="unbounded">- <xsd:element name="metadata">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" />- </xsd:sequence>- <xsd:attribute name="name" use="required" type="xsd:string" />- <xsd:attribute name="type" type="xsd:string" />- <xsd:attribute name="mimetype" type="xsd:string" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="assembly">- <xsd:complexType>- <xsd:attribute name="alias" type="xsd:string" />- <xsd:attribute name="name" type="xsd:string" />- </xsd:complexType>- </xsd:element>- <xsd:element name="data">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="resheader">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" />- </xsd:complexType>- </xsd:element>- </xsd:choice>- </xsd:complexType>- </xsd:element>- </xsd:schema>- <resheader name="resmimetype">- <value>text/microsoft-resx</value>- </resheader>- <resheader name="version">- <value>2.0</value>- </resheader>- <resheader name="reader">- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <resheader name="writer">- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <data name="AccessibleName" xml:space="preserve">- <value>Encoders and decoders</value>- </data>- <data name="DisplayTitle" xml:space="preserve">- <value>Encoders / Decoders</value>- </data>-</root>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/GZip/GZipEncoderDecoder.Designer.cs b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/GZip/GZipEncoderDecoder.Designer.csdeleted file mode 100644index ea2317b77..000000000--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/GZip/GZipEncoderDecoder.Designer.cs+++ /dev/null@@ -1,207 +0,0 @@-//-------------------------------------------------------------------------------// <auto-generated>-// This code was generated by a tool.-// Runtime Version:4.0.30319.42000-//-// Changes to this file may cause incorrect behavior and will be lost if-// the code is regenerated.-// </auto-generated>-//--------------------------------------------------------------------------------namespace DevToys.Tools.Tools.EncodersDecoders.GZip {- using System;--- /// <summary>- /// A strongly-typed resource class, for looking up localized strings, etc.- /// </summary>- // This class was auto-generated by the StronglyTypedResourceBuilder- // class via a tool like ResGen or Visual Studio.- // To add or remove a member, edit your .ResX file then rerun ResGen- // with the /str option, or rebuild your VS project.- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]- internal class GZipEncoderDecoder {-- private static global::System.Resources.ResourceManager resourceMan;-- private static global::System.Globalization.CultureInfo resourceCulture;-- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]- internal GZipEncoderDecoder() {- }-- /// <summary>- /// Returns the cached ResourceManager instance used by this class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Resources.ResourceManager ResourceManager {- get {- if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Tools.Tools.EncodersDecoders.GZip.GZipEncoderDecoder", typeof(GZipEncoderDecoder).Assembly);- resourceMan = temp;- }- return resourceMan;- }- }-- /// <summary>- /// Overrides the current thread's CurrentUICulture property for all- /// resource lookups using this strongly typed resource class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Globalization.CultureInfo Culture {- get {- return resourceCulture;- }- set {- resourceCulture = value;- }- }-- /// <summary>- /// Looks up a localized string similar to GZip Compressor and Decompressor tool.- /// </summary>- internal static string AccessibleName {- get {- return ResourceManager.GetString("AccessibleName", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Compress.- /// </summary>- internal static string CompressionModeCompress {- get {- return ResourceManager.GetString("CompressionModeCompress", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Decompress.- /// </summary>- internal static string CompressionModeDecompress {- get {- return ResourceManager.GetString("CompressionModeDecompress", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Select whether the input should be compressed or decompressed.- /// </summary>- internal static string CompressionModeDescription {- get {- return ResourceManager.GetString("CompressionModeDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Whether to compress or decompress a GZip string.- /// </summary>- internal static string CompressionModeOptionDescription {- get {- return ResourceManager.GetString("CompressionModeOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Compression mode.- /// </summary>- internal static string CompressionModeTitle {- get {- return ResourceManager.GetString("CompressionModeTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Compression ratio.- /// </summary>- internal static string CompressionRatio {- get {- return ResourceManager.GetString("CompressionRatio", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to {0:0.#} %.- /// </summary>- internal static string CompressionRatioValue {- get {- return ResourceManager.GetString("CompressionRatioValue", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Configuration.- /// </summary>- internal static string ConfigurationTitle {- get {- return ResourceManager.GetString("ConfigurationTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Compress or decompress a text in GZip.- /// </summary>- internal static string Description {- get {- return ResourceManager.GetString("Description", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Text to compress or GZip to decompress.- /// </summary>- internal static string InputOptionDescription {- get {- return ResourceManager.GetString("InputOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Input.- /// </summary>- internal static string InputTitle {- get {- return ResourceManager.GetString("InputTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to <Invalid GZip data>.- /// </summary>- internal static string InvalidGZipData {- get {- return ResourceManager.GetString("InvalidGZipData", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to GZip Compress / Decompress.- /// </summary>- internal static string LongDisplayTitle {- get {- return ResourceManager.GetString("LongDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Output.- /// </summary>- internal static string OutputTitle {- get {- return ResourceManager.GetString("OutputTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to GZip.- /// </summary>- internal static string ShortDisplayTitle {- get {- return ResourceManager.GetString("ShortDisplayTitle", resourceCulture);- }- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/GZip/GZipEncoderDecoder.resx b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/GZip/GZipEncoderDecoder.resxdeleted file mode 100644index 273de6e1b..000000000--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/GZip/GZipEncoderDecoder.resx+++ /dev/null@@ -1,168 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<root>- <!--- Microsoft ResX Schema-- Version 2.0-- The primary goals of this format is to allow a simple XML format- that is mostly human readable. The generation and parsing of the- various data types are done through the TypeConverter classes- associated with the data types.-- Example:-- ... ado.net/XML headers & schema ...- <resheader name="resmimetype">text/microsoft-resx</resheader>- <resheader name="version">2.0</resheader>- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">- <value>[base64 mime encoded serialized .NET Framework object]</value>- </data>- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>- <comment>This is a comment</comment>- </data>-- There are any number of "resheader" rows that contain simple- name/value pairs.-- Each data row contains a name, and value. The row also contains a- type or mimetype. Type corresponds to a .NET class that support- text/value conversion through the TypeConverter architecture.- Classes that don't support this are serialized and stored with the- mimetype set.-- The mimetype is used for serialized objects, and tells the- ResXResourceReader how to depersist the object. This is currently not- extensible. For a given mimetype the value must be set accordingly:-- Note - application/x-microsoft.net.object.binary.base64 is the format- that the ResXResourceWriter will generate, however the reader can- read any of the formats listed below.-- mimetype: application/x-microsoft.net.object.binary.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.soap.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.bytearray.base64- value : The object must be serialized into a byte array- : using a System.ComponentModel.TypeConverter- : and then encoded with base64 encoding.- -->- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />- <xsd:element name="root" msdata:IsDataSet="true">- <xsd:complexType>- <xsd:choice maxOccurs="unbounded">- <xsd:element name="metadata">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" />- </xsd:sequence>- <xsd:attribute name="name" use="required" type="xsd:string" />- <xsd:attribute name="type" type="xsd:string" />- <xsd:attribute name="mimetype" type="xsd:string" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="assembly">- <xsd:complexType>- <xsd:attribute name="alias" type="xsd:string" />- <xsd:attribute name="name" type="xsd:string" />- </xsd:complexType>- </xsd:element>- <xsd:element name="data">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="resheader">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" />- </xsd:complexType>- </xsd:element>- </xsd:choice>- </xsd:complexType>- </xsd:element>- </xsd:schema>- <resheader name="resmimetype">- <value>text/microsoft-resx</value>- </resheader>- <resheader name="version">- <value>2.0</value>- </resheader>- <resheader name="reader">- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <resheader name="writer">- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <data name="AccessibleName" xml:space="preserve">- <value>GZip Compressor and Decompressor tool</value>- </data>- <data name="CompressionModeCompress" xml:space="preserve">- <value>Compress</value>- </data>- <data name="CompressionModeDecompress" xml:space="preserve">- <value>Decompress</value>- </data>- <data name="CompressionModeDescription" xml:space="preserve">- <value>Select whether the input should be compressed or decompressed</value>- </data>- <data name="CompressionModeOptionDescription" xml:space="preserve">- <value>Whether to compress or decompress a GZip string</value>- </data>- <data name="CompressionModeTitle" xml:space="preserve">- <value>Compression mode</value>- </data>- <data name="CompressionRatio" xml:space="preserve">- <value>Compression ratio</value>- </data>- <data name="CompressionRatioValue" xml:space="preserve">- <value>{0:0.#} %</value>- </data>- <data name="ConfigurationTitle" xml:space="preserve">- <value>Configuration</value>- </data>- <data name="Description" xml:space="preserve">- <value>Compress or decompress a text in GZip</value>- </data>- <data name="InputOptionDescription" xml:space="preserve">- <value>Text to compress or GZip to decompress</value>- </data>- <data name="InputTitle" xml:space="preserve">- <value>Input</value>- </data>- <data name="InvalidGZipData" xml:space="preserve">- <value><Invalid GZip data></value>- </data>- <data name="LongDisplayTitle" xml:space="preserve">- <value>GZip Compress / Decompress</value>- </data>- <data name="OutputTitle" xml:space="preserve">- <value>Output</value>- </data>- <data name="ShortDisplayTitle" xml:space="preserve">- <value>GZip</value>- </data>-</root>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/GZip/GZipEncoderDecoderCommandLineTool.cs b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/GZip/GZipEncoderDecoderCommandLineTool.csdeleted file mode 100644index a5f9a8095..000000000--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/GZip/GZipEncoderDecoderCommandLineTool.cs+++ /dev/null@@ -1,41 +0,0 @@-using System.IO.Compression;-using DevToys.Tools.Helpers;-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.Tools.EncodersDecoders.GZip;--[Export(typeof(ICommandLineTool))]-[Name("GZipEncoderDecoder")]-[CommandName(- Name = "gzip",- ResourceManagerBaseName = "DevToys.Tools.Tools.EncodersDecoders.GZip.GZipEncoderDecoder",- DescriptionResourceName = nameof(GZipEncoderDecoder.Description))]-internal sealed class GZipEncoderDecoderCommandLineTool : ICommandLineTool-{- [CommandLineOption(- Name = "input",- Alias = "i",- IsRequired = true,- DescriptionResourceName = nameof(GZipEncoderDecoder.InputOptionDescription))]- private string? Input { get; set; } // TODO: Support file as input too.-- [CommandLineOption(- Name = "mode",- Alias = "m",- DescriptionResourceName = nameof(GZipEncoderDecoder.CompressionModeOptionDescription))]- private CompressionMode CompressionMode { get; set; } = CompressionMode.Compress;-- public async ValueTask<int> InvokeAsync(ILogger logger, CancellationToken cancellationToken)- {- (string data, double differencePercentage) conversionResult- = await GZipHelper.CompressOrDecompressAsync(- Input,- CompressionMode,- logger,- cancellationToken);-- Console.WriteLine(conversionResult.data);-- return 0;- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/GZip/GZipEncoderDecoderGuiTool.cs b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/GZip/GZipEncoderDecoderGuiTool.csdeleted file mode 100644index 31f7db380..000000000--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/GZip/GZipEncoderDecoderGuiTool.cs+++ /dev/null@@ -1,216 +0,0 @@-using System.IO.Compression;-using DevToys.Tools.Helpers;-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.Tools.EncodersDecoders.GZip;--[Export(typeof(IGuiTool))]-[Name("GZipEncoderDecoder")]-[ToolDisplayInformation(- IconFontName = "DevToys-Tools-Icons",- IconGlyph = '\u0120',- GroupName = PredefinedCommonToolGroupNames.EncodersDecoders,- ResourceManagerAssemblyIdentifier = nameof(DevToysToolsResourceManagerAssemblyIdentifier),- ResourceManagerBaseName = "DevToys.Tools.Tools.EncodersDecoders.GZip.GZipEncoderDecoder",- ShortDisplayTitleResourceName = nameof(GZipEncoderDecoder.ShortDisplayTitle),- LongDisplayTitleResourceName = nameof(GZipEncoderDecoder.LongDisplayTitle),- DescriptionResourceName = nameof(GZipEncoderDecoder.Description),- AccessibleNameResourceName = nameof(GZipEncoderDecoder.AccessibleName))]-[AcceptedDataTypeName(PredefinedCommonDataTypeNames.GZip)]-internal sealed partial class GZipEncoderDecoderGuiTool : IGuiTool, IDisposable-{- /// <summary>- /// Whether the tool should compress or decompress GZip.- /// </summary>- private static readonly SettingDefinition<CompressionMode> compressionMode- = new(- name: $"{nameof(GZipEncoderDecoderGuiTool)}.{nameof(compressionMode)}",- defaultValue: CompressionMode.Compress);-- private enum GridRows- {- Settings,- Input,- Output,- CompressionRatio- }-- private enum GridColumns- {- Stretch- }-- private readonly DisposableSemaphore _semaphore = new();- private readonly ILogger _logger;- private readonly ISettingsProvider _settingsProvider;- private readonly IUISwitch _compressionModeSwitch = Switch("gzip-compression-mode-switch");- private readonly IUIMultiLineTextInput _inputText = MultilineTextInput("gzip-input-box");- private readonly IUIMultiLineTextInput _outputText = MultilineTextInput("gzip-output-box");- private readonly IUIInfoBar _compressionRatioInfoBar = InfoBar("gzip-compression-ratio-info-bar");-- private CancellationTokenSource? _cancellationTokenSource;-- [ImportingConstructor]- public GZipEncoderDecoderGuiTool(ISettingsProvider settingsProvider)- {- _logger = this.Log();- _settingsProvider = settingsProvider;-- switch (_settingsProvider.GetSetting(compressionMode))- {- case CompressionMode.Compress:- _compressionModeSwitch.On();- _inputText.AutoWrap();- _outputText.AlwaysWrap();- break;-- case CompressionMode.Decompress:- _inputText.AlwaysWrap();- _outputText.AutoWrap();- break;-- default:- throw new NotSupportedException();- }- }-- // For unit tests.- internal Task? WorkTask { get; private set; }-- public UIToolView View- => new(- isScrollable: true,- Grid()- .RowLargeSpacing()-- .Rows(- (GridRows.Settings, Auto),- (GridRows.Input, new UIGridLength(1, UIGridUnitType.Fraction)),- (GridRows.Output, new UIGridLength(1, UIGridUnitType.Fraction)),- (GridRows.CompressionRatio, Auto))-- .Columns(- (GridColumns.Stretch, new UIGridLength(1, UIGridUnitType.Fraction)))-- .Cells(- Cell(- GridRows.Settings,- GridColumns.Stretch,-- Stack()- .Vertical()- .SmallSpacing()-- .WithChildren(- Label()- .Text(GZipEncoderDecoder.ConfigurationTitle),-- Setting("gzip-conversion-mode-setting")- .Icon("FluentSystemIcons", '\uF18D')- .Title(GZipEncoderDecoder.CompressionModeTitle)- .Description(GZipEncoderDecoder.CompressionModeDescription)-- .InteractiveElement(- _compressionModeSwitch- .OnText(GZipEncoderDecoder.CompressionModeCompress)- .OffText(GZipEncoderDecoder.CompressionModeDecompress)- .OnToggle(OnCompressionModeChanged)))),-- Cell(- GridRows.Input,- GridColumns.Stretch,-- _inputText- .Title(GZipEncoderDecoder.InputTitle)- .OnTextChanged(OnInputTextChanged)),-- Cell(- GridRows.Output,- GridColumns.Stretch,-- _outputText- .Title(GZipEncoderDecoder.OutputTitle)- .ReadOnly()- .Extendable()),-- Cell(- GridRows.CompressionRatio,- GridColumns.Stretch,-- _compressionRatioInfoBar- .Informational()- .NonClosable()- .HideIcon()- .Open()- .Title(GZipEncoderDecoder.CompressionRatio))));-- public void OnDataReceived(string dataTypeName, object? parsedData)- {- if (dataTypeName == PredefinedCommonDataTypeNames.GZip && parsedData is string text)- {- _compressionModeSwitch.Off(); // Switch to Decompress mode- _inputText.Text(text); // This will trigger a conversion.- }- }-- public void Dispose()- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _semaphore.Dispose();- }-- private void OnCompressionModeChanged(bool conversionMode)- {- _settingsProvider.SetSetting(compressionMode, conversionMode ? CompressionMode.Compress : CompressionMode.Decompress);- _inputText.Text(_outputText.Text); // This will trigger a conversion.-- switch (_settingsProvider.GetSetting(compressionMode))- {- case CompressionMode.Compress:- _inputText.AutoWrap();- _outputText.AlwaysWrap();- break;-- case CompressionMode.Decompress:- _inputText.AlwaysWrap();- _outputText.AutoWrap();- break;-- default:- throw new NotSupportedException();- }- }-- private void OnInputTextChanged(string text)- {- StartConvert(text);- }-- private void StartConvert(string text)- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _cancellationTokenSource = new CancellationTokenSource();-- WorkTask = ConvertAsync(text, _settingsProvider.GetSetting(compressionMode), _cancellationTokenSource.Token);- }-- private async Task ConvertAsync(string input, CompressionMode compressionModeSetting, CancellationToken cancellationToken)- {- using (await _semaphore.WaitAsync(cancellationToken))- {- await TaskSchedulerAwaiter.SwitchOffMainThreadAsync(cancellationToken);-- (string data, double differencePercentage) conversionResult- = await GZipHelper.CompressOrDecompressAsync(- input,- compressionModeSetting,- _logger,- cancellationToken);-- _compressionRatioInfoBar.Description(string.Format(GZipEncoderDecoder.CompressionRatioValue, conversionResult.differencePercentage));- _outputText.Text(conversionResult.data);- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Html/HtmlEncoderDecoder.resx b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Html/HtmlEncoderDecoder.resxdeleted file mode 100644index 5f217ad12..000000000--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Html/HtmlEncoderDecoder.resx+++ /dev/null@@ -1,159 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<root>- <!--- Microsoft ResX Schema-- Version 2.0-- The primary goals of this format is to allow a simple XML format- that is mostly human readable. The generation and parsing of the- various data types are done through the TypeConverter classes- associated with the data types.-- Example:-- ... ado.net/XML headers & schema ...- <resheader name="resmimetype">text/microsoft-resx</resheader>- <resheader name="version">2.0</resheader>- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">- <value>[base64 mime encoded serialized .NET Framework object]</value>- </data>- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>- <comment>This is a comment</comment>- </data>-- There are any number of "resheader" rows that contain simple- name/value pairs.-- Each data row contains a name, and value. The row also contains a- type or mimetype. Type corresponds to a .NET class that support- text/value conversion through the TypeConverter architecture.- Classes that don't support this are serialized and stored with the- mimetype set.-- The mimetype is used for serialized objects, and tells the- ResXResourceReader how to depersist the object. This is currently not- extensible. For a given mimetype the value must be set accordingly:-- Note - application/x-microsoft.net.object.binary.base64 is the format- that the ResXResourceWriter will generate, however the reader can- read any of the formats listed below.-- mimetype: application/x-microsoft.net.object.binary.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.soap.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.bytearray.base64- value : The object must be serialized into a byte array- : using a System.ComponentModel.TypeConverter- : and then encoded with base64 encoding.- -->- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />- <xsd:element name="root" msdata:IsDataSet="true">- <xsd:complexType>- <xsd:choice maxOccurs="unbounded">- <xsd:element name="metadata">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" />- </xsd:sequence>- <xsd:attribute name="name" use="required" type="xsd:string" />- <xsd:attribute name="type" type="xsd:string" />- <xsd:attribute name="mimetype" type="xsd:string" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="assembly">- <xsd:complexType>- <xsd:attribute name="alias" type="xsd:string" />- <xsd:attribute name="name" type="xsd:string" />- </xsd:complexType>- </xsd:element>- <xsd:element name="data">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="resheader">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" />- </xsd:complexType>- </xsd:element>- </xsd:choice>- </xsd:complexType>- </xsd:element>- </xsd:schema>- <resheader name="resmimetype">- <value>text/microsoft-resx</value>- </resheader>- <resheader name="version">- <value>2.0</value>- </resheader>- <resheader name="reader">- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <resheader name="writer">- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <data name="AccessibleName" xml:space="preserve">- <value>HTML Encoder and Decoder tool</value>- </data>- <data name="ConfigurationTitle" xml:space="preserve">- <value>Configuration</value>- </data>- <data name="ConversionDecode" xml:space="preserve">- <value>Decode</value>- </data>- <data name="ConversionDescription" xml:space="preserve">- <value>Select which conversion mode you want to use</value>- </data>- <data name="ConversionEncode" xml:space="preserve">- <value>Encode</value>- </data>- <data name="ConversionOptionDescription" xml:space="preserve">- <value>Whether to encode or decode HTML</value>- </data>- <data name="ConversionTitle" xml:space="preserve">- <value>Conversion</value>- </data>- <data name="Description" xml:space="preserve">- <value>Encode and decode HTML text data</value>- </data>- <data name="InputOptionDescription" xml:space="preserve">- <value>Text to encode or HTML to decode</value>- </data>- <data name="InputTitle" xml:space="preserve">- <value>Input</value>- </data>- <data name="LongDisplayTitle" xml:space="preserve">- <value>HTML Text Encoder / Decoder</value>- </data>- <data name="OutputTitle" xml:space="preserve">- <value>Output</value>- </data>- <data name="ShortDisplayTitle" xml:space="preserve">- <value>HTML</value>- </data>-</root>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Html/HtmlEncoderDecoderCommandLineTool.cs b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Html/HtmlEncoderDecoderCommandLineTool.csdeleted file mode 100644index 085f9f6e0..000000000--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Html/HtmlEncoderDecoderCommandLineTool.cs+++ /dev/null@@ -1,39 +0,0 @@-using DevToys.Tools.Helpers;-using DevToys.Tools.Models;-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.Tools.EncodersDecoders.Html;--[Export(typeof(ICommandLineTool))]-[Name("HtmlEncoderDecoder")]-[CommandName(- Name = "html",- ResourceManagerBaseName = "DevToys.Tools.Tools.EncodersDecoders.Html.HtmlEncoderDecoder",- DescriptionResourceName = nameof(HtmlEncoderDecoder.Description))]-internal sealed class HtmlEncoderDecoderCommandLineTool : ICommandLineTool-{- [CommandLineOption(- Name = "input",- Alias = "i",- IsRequired = true,- DescriptionResourceName = nameof(HtmlEncoderDecoder.InputOptionDescription))]- private string? Input { get; set; }-- [CommandLineOption(- Name = "conversion",- Alias = "c",- DescriptionResourceName = nameof(HtmlEncoderDecoder.ConversionOptionDescription))]- private EncodingConversion EncodingConversionMode { get; set; } = EncodingConversion.Encode;-- public ValueTask<int> InvokeAsync(ILogger logger, CancellationToken cancellationToken)- {- Console.WriteLine(- HtmlHelper.EncodeOrDecode(- Input,- EncodingConversionMode,- logger,- cancellationToken));-- return new ValueTask<int>(0);- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Html/HtmlEncoderDecoderGuiTool.cs b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Html/HtmlEncoderDecoderGuiTool.csdeleted file mode 100644index 509afad8c..000000000--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Html/HtmlEncoderDecoderGuiTool.cs+++ /dev/null@@ -1,178 +0,0 @@-using DevToys.Tools.Helpers;-using DevToys.Tools.Models;-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.Tools.EncodersDecoders.Html;--[Export(typeof(IGuiTool))]-[Name("HtmlEncoderDecoder")]-[ToolDisplayInformation(- IconFontName = "DevToys-Tools-Icons",- IconGlyph = '\u0107',- GroupName = PredefinedCommonToolGroupNames.EncodersDecoders,- ResourceManagerAssemblyIdentifier = nameof(DevToysToolsResourceManagerAssemblyIdentifier),- ResourceManagerBaseName = "DevToys.Tools.Tools.EncodersDecoders.Html.HtmlEncoderDecoder",- ShortDisplayTitleResourceName = nameof(HtmlEncoderDecoder.ShortDisplayTitle),- LongDisplayTitleResourceName = nameof(HtmlEncoderDecoder.LongDisplayTitle),- DescriptionResourceName = nameof(HtmlEncoderDecoder.Description),- AccessibleNameResourceName = nameof(HtmlEncoderDecoder.AccessibleName))]-internal sealed partial class HtmlEncoderDecoderGuiTool : IGuiTool, IDisposable-{- /// <summary>- /// Whether the tool should encode or decode Html.- /// </summary>- private static readonly SettingDefinition<EncodingConversion> conversionMode- = new(- name: $"{nameof(HtmlEncoderDecoderGuiTool)}.{nameof(conversionMode)}",- defaultValue: EncodingConversion.Encode);-- private enum GridRows- {- Settings,- Input,- Output- }-- private enum GridColumns- {- Stretch- }-- private readonly DisposableSemaphore _semaphore = new();- private readonly ILogger _logger;- private readonly ISettingsProvider _settingsProvider;- private readonly IUISwitch _conversionModeSwitch = Switch("html-conversion-mode-switch");- private readonly IUIMultiLineTextInput _inputText = MultilineTextInput("html-input-box");- private readonly IUIMultiLineTextInput _outputText = MultilineTextInput("html-output-box");-- private CancellationTokenSource? _cancellationTokenSource;-- [ImportingConstructor]- public HtmlEncoderDecoderGuiTool(ISettingsProvider settingsProvider)- {- _logger = this.Log();- _settingsProvider = settingsProvider;-- switch (_settingsProvider.GetSetting(conversionMode))- {- case EncodingConversion.Encode:- _conversionModeSwitch.On();- _inputText.AutoWrap();- _outputText.AlwaysWrap();- break;-- case EncodingConversion.Decode:- _inputText.AlwaysWrap();- _outputText.AutoWrap();- break;-- default:- throw new NotSupportedException();- }- }-- // For unit tests.- internal Task? WorkTask { get; private set; }-- public UIToolView View- => new(- isScrollable: true,- Grid()- .RowLargeSpacing()-- .Rows(- (GridRows.Settings, Auto),- (GridRows.Input, new UIGridLength(1, UIGridUnitType.Fraction)),- (GridRows.Output, new UIGridLength(1, UIGridUnitType.Fraction)))-- .Columns(- (GridColumns.Stretch, new UIGridLength(1, UIGridUnitType.Fraction)))-- .Cells(- Cell(- GridRows.Settings,- GridColumns.Stretch,-- Stack()- .Vertical()- .SmallSpacing()-- .WithChildren(- Label()- .Text(HtmlEncoderDecoder.ConfigurationTitle),-- Setting("html-conversion-mode-setting")- .Icon("FluentSystemIcons", '\uF18D')- .Title(HtmlEncoderDecoder.ConversionTitle)- .Description(HtmlEncoderDecoder.ConversionDescription)-- .InteractiveElement(- _conversionModeSwitch- .OnText(HtmlEncoderDecoder.ConversionEncode)- .OffText(HtmlEncoderDecoder.ConversionDecode)- .OnToggle(OnConversionModeChanged)))),-- Cell(- GridRows.Input,- GridColumns.Stretch,-- _inputText- .Title(HtmlEncoderDecoder.InputTitle)- .OnTextChanged(OnInputTextChanged)),-- Cell(- GridRows.Output,- GridColumns.Stretch,-- _outputText- .Title(HtmlEncoderDecoder.OutputTitle)- .ReadOnly()- .Extendable())));-- public void OnDataReceived(string dataTypeName, object? parsedData)- {- throw new NotImplementedException();- }-- public void Dispose()- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _semaphore.Dispose();- }-- private void OnConversionModeChanged(bool conversionMode)- {- _settingsProvider.SetSetting(HtmlEncoderDecoderGuiTool.conversionMode, conversionMode ? EncodingConversion.Encode : EncodingConversion.Decode);- _inputText.Text(_outputText.Text); // This will trigger a conversion.- }-- private void OnInputTextChanged(string text)- {- StartConvert(text);- }-- private void StartConvert(string text)- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _cancellationTokenSource = new CancellationTokenSource();-- WorkTask = ConvertAsync(text, _settingsProvider.GetSetting(conversionMode), _cancellationTokenSource.Token);- }-- private async Task ConvertAsync(string input, EncodingConversion conversionModeSetting, CancellationToken cancellationToken)- {- using (await _semaphore.WaitAsync(cancellationToken))- {- await TaskSchedulerAwaiter.SwitchOffMainThreadAsync(cancellationToken);-- _outputText.Text(- HtmlHelper.EncodeOrDecode(- input,- conversionModeSetting,- _logger,- cancellationToken));- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/JsonWebToken/JsonWebTokenDecoderGuiTool.cs b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/JsonWebToken/JsonWebTokenDecoderGuiTool.csdeleted file mode 100644index d57b4d611..000000000--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/JsonWebToken/JsonWebTokenDecoderGuiTool.cs+++ /dev/null@@ -1,590 +0,0 @@-using DevToys.Tools.Helpers.JsonWebToken;-using DevToys.Tools.Models;-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.Tools.EncodersDecoders.JsonWebToken;--internal sealed partial class JsonWebTokenDecoderGuiTool-{- /// <summary>- /// Define if we want to validate the token or not- /// </summary>- private static readonly SettingDefinition<bool> validateTokenSetting- = new(- name: $"{nameof(JsonWebTokenDecoderGuiTool)}.{nameof(validateTokenSetting)}",- defaultValue: false);-- /// <summary>- /// Define if we want to validate the token issuer signing key or not- /// </summary>- private static readonly SettingDefinition<bool> validateTokenIssuerSigningKeySetting- = new(- name: $"{nameof(JsonWebTokenDecoderGuiTool)}.{nameof(validateTokenIssuerSigningKeySetting)}",- defaultValue: false);-- #region TokenIssuers- /// <summary>- /// Define if we want to validate the token issuers or not- /// </summary>- private static readonly SettingDefinition<bool> validateTokenIssuerSetting- = new(- name: $"{nameof(JsonWebTokenDecoderGuiTool)}.{nameof(validateTokenIssuerSetting)}",- defaultValue: false);-- /// <summary>- /// Define the issuers list- /// </summary>- private static readonly SettingDefinition<string> tokenIssuerSetting- = new(- name: $"{nameof(JsonWebTokenDecoderGuiTool)}.{nameof(tokenIssuerSetting)}",- defaultValue: string.Empty);- #endregion-- #region TokenAudiences- /// <summary>- /// Define if we want to validate the token audiences or not- /// </summary>- private static readonly SettingDefinition<bool> validateTokenAudiencesSetting- = new(- name: $"{nameof(JsonWebTokenDecoderGuiTool)}.{nameof(validateTokenAudiencesSetting)}",- defaultValue: false);-- /// <summary>- /// Define the audiences list- /// </summary>- private static readonly SettingDefinition<string> tokenAudiencesSetting- = new(- name: $"{nameof(JsonWebTokenDecoderGuiTool)}.{nameof(tokenAudiencesSetting)}",- defaultValue: string.Empty);- #endregion-- /// <summary>- /// Define if we want to validate the token lifetime or not- /// </summary>- private static readonly SettingDefinition<bool> validateTokenLifetimeSetting- = new(- name: $"{nameof(JsonWebTokenDecoderGuiTool)}.{nameof(validateTokenLifetimeSetting)}",- defaultValue: false);-- /// <summary>- /// Define if we want to validate the token actors- /// </summary>- private static readonly SettingDefinition<bool> validateTokenActorsSetting- = new(- name: $"{nameof(JsonWebTokenDecoderGuiTool)}.{nameof(validateTokenActorsSetting)}",- defaultValue: false);-- private bool _showPayloadClaim;- private JsonWebTokenAlgorithm _currentAlgorithm = JsonWebTokenAlgorithm.HS256;-- private readonly ILogger _logger;- private readonly ISettingsProvider _settingsProvider;-- private readonly IUIInfoBar _infoBar = InfoBar("jwt-decode-info-bar");- private readonly IUIStack _viewStack = Stack("jwt-decode-view-stack");- private readonly IUIStack _decodeSettingsStack = Stack("jwt-decode-settings-stack");-- private readonly IUISwitch _validateTokenSwitch = Switch("jwt-decode-validate-token-switch");- private readonly IUISwitch _validateTokenIssuerSigningKeySwitch = Switch("jwt-decode-validate-token-issuer-signing-key-switch");- private readonly IUISwitch _validateTokenIssuersSwitch = Switch("jwt-decode-validate-token-issuers-switch");- private readonly IUISwitch _validateTokenAudiencesSwitch = Switch("jwt-decode-validate-token-audiences-switch");- private readonly IUISwitch _validateLifetimeSwitch = Switch("jwt-decode-validate-token-lifetime-switch");- private readonly IUISwitch _validateActorsSwitch = Switch("jwt-decode-validate-token-actors-switch");-- private readonly IUISingleLineTextInput _validateTokenIssuersInput = SingleLineTextInput("jwt-decode-validate-token-issuers-input");- private readonly IUISingleLineTextInput _validateTokenAudiencesInput = SingleLineTextInput("jwt-decode-validate-token-audiences-input");-- private readonly IUIMultiLineTextInput _tokenInput = MultilineTextInput("jwt-decode-token-input");- private readonly IUIMultiLineTextInput _headerInput = MultilineTextInput("jwt-decode-header-input", "json");- private readonly IUIMultiLineTextInput _payloadInput = MultilineTextInput("jwt-decode-payload-input", "json");- private readonly IUIMultiLineTextInput _signatureInput = MultilineTextInput("jwt-decode-signature-input");- private readonly IUIMultiLineTextInput _publicKeyInput = MultilineTextInput("jwt-decode-public-key-input");-- private readonly IUIDataGrid _payloadClaimsDataGrid = DataGrid("jwt-decode-payload-claims-data-grid");-- private static readonly List<string> dateFields = new() { "exp", "nbf", "iat", "auth_time", "updated_at" };-- private DisposableSemaphore _semaphore = new();- private CancellationTokenSource? _cancellationTokenSource;-- [ImportingConstructor]- public JsonWebTokenDecoderGuiTool(ISettingsProvider settingsProvider)- {- _logger = this.Log();- _settingsProvider = settingsProvider;- ConfigureUI();- GetTokenAlgorithm();- }-- internal Task? WorkTask { get; private set; }-- public IUIStack ViewStack- => _viewStack- .Vertical()- .WithChildren(- SettingGroup("jwt-decode-validate-token-setting")- .Icon("FluentSystemIcons", '\uec9e')- .Title(JsonWebTokenEncoderDecoder.DecodeValidateTokenSettingsTitle)- .Description(JsonWebTokenEncoderDecoder.DecodeValidateTokenSettingsDescription)- .InteractiveElement(- _validateTokenSwitch- .OnText(JsonWebTokenEncoderDecoder.Yes)- .OffText(JsonWebTokenEncoderDecoder.No)- .OnToggle(OnValidateTokenChanged)- )- .WithChildren(- Setting("jwt-decode-validate-token-issuer-signing-key-setting")- .Icon("FluentSystemIcons", '\ue30a')- .Title(JsonWebTokenEncoderDecoder.DecodeValidateTokenIssuerSigningKeyTitle)- .InteractiveElement(- _validateTokenIssuerSigningKeySwitch- .OnText(JsonWebTokenEncoderDecoder.Yes)- .OffText(JsonWebTokenEncoderDecoder.No)- .OnToggle(OnValidateTokenIssuerSigningKey)- ),- SettingGroup("jwt-decode-validate-token-issuers-setting-group")- .Icon("FluentSystemIcons", '\ue30a')- .Title(JsonWebTokenEncoderDecoder.DecodeValidateTokenIssuerTitle)- .InteractiveElement(- _validateTokenIssuersSwitch- .OnText(JsonWebTokenEncoderDecoder.Yes)- .OffText(JsonWebTokenEncoderDecoder.No)- .OnToggle(OnValidateTokenIssuer)- )- .WithChildren(- _validateTokenIssuersInput- .Title(JsonWebTokenEncoderDecoder.DecodeValidateTokenIssuerInputLabel)- .OnTextChanged(OnTokenIssuerInputChanged)- ),- SettingGroup("jwt-decode-validate-token-audiences-setting-group")- .Icon("FluentSystemIcons", '\ue30a')- .Title(JsonWebTokenEncoderDecoder.DecodeValidateTokenAudiencesTitle)- .InteractiveElement(- _validateTokenAudiencesSwitch- .OnText(JsonWebTokenEncoderDecoder.Yes)- .OffText(JsonWebTokenEncoderDecoder.No)- .OnToggle(OnValidateTokenAudiences)- )- .WithChildren(- _validateTokenAudiencesInput- .Title(JsonWebTokenEncoderDecoder.DecodeValidateTokenAudiencesInputLabel)- .OnTextChanged(OnTokenAudiencesInputChanged)- ),- Setting("jwt-decode-validate-token-lifetime-setting")- .Icon("FluentSystemIcons", '\ue30a')- .Title(JsonWebTokenEncoderDecoder.DecodeValidateTokenLifetimeTitle)- .InteractiveElement(- _validateLifetimeSwitch- .OnText(JsonWebTokenEncoderDecoder.Yes)- .OffText(JsonWebTokenEncoderDecoder.No)- .OnToggle(OnValidateTokenLifetime)- ),- Setting("jwt-decode-validate-token-actors-setting")- .Icon("FluentSystemIcons", '\ue30a')- .Title(JsonWebTokenEncoderDecoder.DecodeValidateTokenActorsTitle)- .InteractiveElement(- _validateActorsSwitch- .OnText(JsonWebTokenEncoderDecoder.Yes)- .OffText(JsonWebTokenEncoderDecoder.No)- .OnToggle(OnValidateTokenActors)- )- ),- _infoBar- .NonClosable(),- _tokenInput- .Title(JsonWebTokenEncoderDecoder.TokenInputTitle)- .OnTextChanged(OnTokenInputChanged),- SplitGrid()- .Vertical()- .WithLeftPaneChild(- _headerInput- .Title(JsonWebTokenEncoderDecoder.HeaderInputTitle)- .ReadOnly()- )- .WithRightPaneChild(- Stack()- .Vertical()- .WithChildren(- _payloadInput- .Title(JsonWebTokenEncoderDecoder.PayloadInputTitle)- .ReadOnly()- .Extendable()- .CommandBarExtraContent(- Stack("jwt-decode-payload-stack")- .Horizontal()- .WithChildren(- Button("jwt-decode-payload-claims-toggle-button")- .Icon("FluentSystemIcons", '\uf4a5')- .OnClick(OnPayloadClaimClicked)- )- ),- _payloadClaimsDataGrid- .Extendable()- .CommandBarExtraContent(- Stack("jwt-decode-payload-claims-stack")- .Horizontal()- .WithChildren(- Button("jwt-decode-payload-claims-toggle-button")- .Icon("FluentSystemIcons", '\uf4a5')- .OnClick(OnPayloadClaimClicked)- )- )- .WithColumns(JsonWebTokenEncoderDecoder.ClaimTypeTitle, JsonWebTokenEncoderDecoder.ClaimValueTitle)- )- ),- _signatureInput- .Title(JsonWebTokenEncoderDecoder.SignatureInputTitle)- .OnTextChanged(OnTokenInputChanged),- _publicKeyInput- .Title(JsonWebTokenEncoderDecoder.PublicKeyInputTitle)- .OnTextChanged(OnTokenInputChanged)- );-- public void Show()- {- _viewStack.Show();- _semaphore = new();- _cancellationTokenSource = new CancellationTokenSource();- }-- public void Hide()- {- _viewStack.Hide();- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _semaphore.Dispose();- }-- private void OnValidateTokenChanged(bool validateToken)- {- _settingsProvider.SetSetting(validateTokenSetting, validateToken);- ConfigureUI();- GetTokenAlgorithm();- StartTokenDecode();- }-- #region TokenIssuer-- private void OnValidateTokenIssuerSigningKey(bool validateTokenIssuerSigningKey)- {- _settingsProvider.SetSetting(validateTokenIssuerSigningKeySetting, validateTokenIssuerSigningKey);- StartTokenDecode();- }-- private void OnValidateTokenIssuer(bool validateTokenIssuer)- {- _settingsProvider.SetSetting(validateTokenIssuerSetting, validateTokenIssuer);- if (validateTokenIssuer)- {- _validateTokenIssuersInput.Enable();- }- else- {- _validateTokenIssuersInput.Disable();- }- StartTokenDecode();- }-- private ValueTask OnTokenIssuerInputChanged(string issuer)- {- _settingsProvider.SetSetting(tokenIssuerSetting, issuer);- StartTokenDecode();- return ValueTask.CompletedTask;- }-- #endregion-- #region TokenAudiences-- private void OnValidateTokenAudiences(bool validateTokenAudiences)- {- _settingsProvider.SetSetting(validateTokenAudiencesSetting, validateTokenAudiences);- if (validateTokenAudiences)- {- _validateTokenAudiencesInput.Enable();- }- else- {- _validateTokenAudiencesInput.Disable();- }- StartTokenDecode();- }-- private ValueTask OnTokenAudiencesInputChanged(string audiences)- {- _settingsProvider.SetSetting(tokenAudiencesSetting, audiences);- StartTokenDecode();- return ValueTask.CompletedTask;- }-- #endregion-- #region TokenLifetime-- private void OnValidateTokenLifetime(bool validateTokenLifetime)- {- _settingsProvider.SetSetting(validateTokenLifetimeSetting, validateTokenLifetime);- StartTokenDecode();- }-- #endregion-- #region TokenActors-- private void OnValidateTokenActors(bool validateTokenActors)- {- _settingsProvider.SetSetting(validateTokenActorsSetting, validateTokenActors);- StartTokenDecode();- }-- #endregion-- private void OnPayloadClaimClicked()- {- if (_showPayloadClaim)- {- _payloadInput.Show();- _payloadClaimsDataGrid.Hide();- _showPayloadClaim = false;- return;- }-- _payloadInput.Hide();- _payloadClaimsDataGrid.Show();- _showPayloadClaim = true;- }-- private void OnTokenInputChanged(string text)- {- GetTokenAlgorithm();- StartTokenDecode();- }-- private void StartTokenDecode()- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _cancellationTokenSource = new CancellationTokenSource();-- if (string.IsNullOrWhiteSpace(_tokenInput.Text))- {- ClearUI();- _infoBar.Close();- return;- }-- TokenParameters tokenParameters = new()- {- Token = _tokenInput.Text- };-- DecoderParameters decoderParameters = new();- bool validateTokenSignature = _settingsProvider.GetSetting(validateTokenSetting);- if (validateTokenSignature)- {- decoderParameters.ValidateSignature = validateTokenSignature;- decoderParameters.ValidateActors = _settingsProvider.GetSetting(validateTokenActorsSetting);- decoderParameters.ValidateLifetime = _settingsProvider.GetSetting(validateTokenLifetimeSetting);- decoderParameters.ValidateIssuersSigningKey = _settingsProvider.GetSetting(validateTokenIssuerSigningKeySetting);-- bool validateIssuers = _settingsProvider.GetSetting(validateTokenIssuerSetting);- if (validateIssuers)- {- decoderParameters.ValidateIssuers = validateIssuers;- tokenParameters.Issuers = _settingsProvider.GetSetting(tokenIssuerSetting).Split(',').ToHashSet();- }-- bool validateAudiences = _settingsProvider.GetSetting(validateTokenAudiencesSetting);- if (validateAudiences)- {- decoderParameters.ValidateAudiences = validateAudiences;- tokenParameters.Audiences = _settingsProvider.GetSetting(tokenAudiencesSetting).Split(',').ToHashSet();- }- }-- tokenParameters.TokenAlgorithm = _currentAlgorithm;- if (_currentAlgorithm is JsonWebTokenAlgorithm.HS256 ||- _currentAlgorithm is JsonWebTokenAlgorithm.HS384 ||- _currentAlgorithm is JsonWebTokenAlgorithm.HS512)- {- tokenParameters.Signature = _signatureInput.Text;- }- else- {- tokenParameters.PublicKey = _publicKeyInput.Text;- }-- WorkTask = DecodeTokenAsync(- decoderParameters,- tokenParameters,- _cancellationTokenSource.Token);- }-- private async Task DecodeTokenAsync(- DecoderParameters decoderParameters,- TokenParameters tokenParameters,- CancellationToken cancellationToken)- {- using (await _semaphore.WaitAsync(cancellationToken))- {- ResultInfo<JsonWebTokenResult?, ResultInfoSeverity> result = await JsonWebTokenDecoderHelper.DecodeTokenAsync(- decoderParameters,- tokenParameters,- _logger,- cancellationToken);-- switch (result.Severity)- {- case ResultInfoSeverity.Success:- _infoBar.Close();- _headerInput.Text(result.Data!.Header!);- _payloadInput.Text(result.Data!.Payload!);- _infoBar- .Description(JsonWebTokenEncoderDecoder.ValidToken)- .Success()- .Open();- BuildClaimsDataGrid(_payloadInput, _payloadClaimsDataGrid, result.Data.PayloadClaims);- break;-- case ResultInfoSeverity.Warning:- _headerInput.Text(result.Data!.Header!);- _payloadInput.Text(result.Data!.Payload!);- _infoBar- .Description(result.ErrorMessage)- .Warning()- .Open();- break;-- case ResultInfoSeverity.Error:- _infoBar- .Description(result.ErrorMessage)- .Error()- .Open();- ClearUI();- break;-- default:- throw new NotImplementedException();- }- }- }-- private void ConfigureUI()- {- bool validateToken = _settingsProvider.GetSetting(validateTokenSetting);- if (validateToken)- {- _validateTokenSwitch.On();- _signatureInput.Show();- _validateTokenIssuerSigningKeySwitch.Enable();- _validateTokenIssuersSwitch.Enable();- _validateTokenAudiencesSwitch.Enable();- _validateLifetimeSwitch.Enable();- _validateActorsSwitch.Enable();- }- else- {- _validateTokenSwitch.Off();- _signatureInput.Hide();- _publicKeyInput.Hide();- _infoBar.Close();- _validateTokenIssuerSigningKeySwitch.Disable();- _validateTokenIssuersSwitch.Disable();- _validateTokenAudiencesSwitch.Disable();- _validateLifetimeSwitch.Disable();- _validateActorsSwitch.Disable();- }-- ConfigureSwitch(_settingsProvider.GetSetting(validateTokenIssuerSigningKeySetting), _validateTokenIssuerSigningKeySwitch);- ConfigureSwitch(_settingsProvider.GetSetting(validateTokenIssuerSetting), _validateTokenIssuersSwitch, _validateTokenIssuersInput);- ConfigureSwitch(_settingsProvider.GetSetting(validateTokenAudiencesSetting), _validateTokenAudiencesSwitch, _validateTokenAudiencesInput);- ConfigureSwitch(_settingsProvider.GetSetting(validateTokenLifetimeSetting), _validateLifetimeSwitch);- ConfigureSwitch(_settingsProvider.GetSetting(validateTokenActorsSetting), _validateActorsSwitch);-- _validateTokenIssuersInput.Text(_settingsProvider.GetSetting(tokenIssuerSetting));- _validateTokenAudiencesInput.Text(_settingsProvider.GetSetting(tokenAudiencesSetting));-- _payloadClaimsDataGrid.Hide();- }-- private void GetTokenAlgorithm()- {- bool validateToken = _settingsProvider.GetSetting(validateTokenSetting);- if (validateToken && !string.IsNullOrWhiteSpace(_tokenInput.Text))- {- ResultInfo<JsonWebTokenAlgorithm?> tokenAlgorithm = JsonWebTokenDecoderHelper.GetTokenAlgorithm(_tokenInput.Text, _logger);- if (!tokenAlgorithm.HasSucceeded)- {- _infoBar- .Description(tokenAlgorithm.ErrorMessage)- .Error()- .Show();- return;- }- _currentAlgorithm = tokenAlgorithm.Data.GetValueOrDefault();- if (tokenAlgorithm.Data is JsonWebTokenAlgorithm.HS256 ||- tokenAlgorithm.Data is JsonWebTokenAlgorithm.HS384 ||- tokenAlgorithm.Data is JsonWebTokenAlgorithm.HS512)- {- _signatureInput.Show();- _publicKeyInput.Hide();- }- else- {- _signatureInput.Hide();- _publicKeyInput.Show();- }- }- else if (validateToken)- {- _signatureInput.Hide();- _publicKeyInput.Hide();- }- }-- private void ClearUI()- {- _headerInput.Text(string.Empty);- _payloadInput.Text(string.Empty);- }-- private static void BuildClaimsDataGrid(IUIMultiLineTextInput multilineInput, IUIDataGrid dataGrid, List<JsonWebTokenClaim> claims)- {- dataGrid.Rows.Clear();- var rows = new List<IUIDataGridRow>();- var tooltips = new List<UIHoverTooltip>();- foreach (JsonWebTokenClaim claim in claims)- {- IUIDataGridCell typeCell = Cell(claim.Key);- IUIDataGridCell valueCell = Cell(claim.Value);-- string? localizedDescription = JsonWebTokenEncoderDecoder.ResourceManager.GetString(claim.Key);- if (!string.IsNullOrWhiteSpace(localizedDescription))- {- rows.Add(Row(null, typeCell, valueCell));- UIHoverTooltip tooltip = new(claim.Span, localizedDescription);- tooltips.Add(tooltip);- }- }- multilineInput.HoverTooltip(tooltips.ToArray());- dataGrid.Rows.AddRange(rows);- }-- private static void ConfigureSwitch(bool value, IUISwitch inputSwitch, IUISingleLineTextInput? input = null)- {- if (value)- {- inputSwitch.On();- if (input != null)- {- input.Enable();- }- return;- }- inputSwitch.Off();- if (input != null)- {- input.Disable();- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/JsonWebToken/JsonWebTokenEncoderDecoder.Designer.cs b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/JsonWebToken/JsonWebTokenEncoderDecoder.Designer.csdeleted file mode 100644index 64da46797..000000000--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/JsonWebToken/JsonWebTokenEncoderDecoder.Designer.cs+++ /dev/null@@ -1,891 +0,0 @@-//-------------------------------------------------------------------------------// <auto-generated>-// This code was generated by a tool.-// Runtime Version:4.0.30319.42000-//-// Changes to this file may cause incorrect behavior and will be lost if-// the code is regenerated.-// </auto-generated>-//--------------------------------------------------------------------------------namespace DevToys.Tools.Tools.EncodersDecoders.JsonWebToken {- using System;--- /// <summary>- /// A strongly-typed resource class, for looking up localized strings, etc.- /// </summary>- // This class was auto-generated by the StronglyTypedResourceBuilder- // class via a tool like ResGen or Visual Studio.- // To add or remove a member, edit your .ResX file then rerun ResGen- // with the /str option, or rebuild your VS project.- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]- internal class JsonWebTokenEncoderDecoder {-- private static global::System.Resources.ResourceManager resourceMan;-- private static global::System.Globalization.CultureInfo resourceCulture;-- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]- internal JsonWebTokenEncoderDecoder() {- }-- /// <summary>- /// Returns the cached ResourceManager instance used by this class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Resources.ResourceManager ResourceManager {- get {- if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Tools.Tools.EncodersDecoders.JsonWebToken.JsonWebTokenEncoderDecoder", typeof(JsonWebTokenEncoderDecoder).Assembly);- resourceMan = temp;- }- return resourceMan;- }- }-- /// <summary>- /// Overrides the current thread's CurrentUICulture property for all- /// resource lookups using this strongly typed resource class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Globalization.CultureInfo Culture {- get {- return resourceCulture;- }- set {- resourceCulture = value;- }- }-- /// <summary>- /// Looks up a localized string similar to JWT Encoder and Decoder tool.- /// </summary>- internal static string AccessibleName {- get {- return ResourceManager.GetString("AccessibleName", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The "acr" claim with a value of 0 indicates the end-user authentication didn't meet the requirements of ISO/IEC 29115..- /// </summary>- internal static string acr {- get {- return ResourceManager.GetString("acr", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The "acrs" claim indicates the Auth Context IDs of the operations that the bearer is eligible to perform. Auth Context IDs can be used to trigger a demand for step-up authentication from within your application and services. Often used along with the xms_cc claim..- /// </summary>- internal static string acrs {- get {- return ResourceManager.GetString("acrs", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The "aio" claim is an internal claim used by Microsoft Entra ID to record data for token reuse. Resources shouldn't use this claim..- /// </summary>- internal static string aio {- get {- return ResourceManager.GetString("aio", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Indicates the algorithm used to sign the token.- /// </summary>- internal static string alg {- get {- return ResourceManager.GetString("alg", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Unknown token algorithm.- /// </summary>- internal static string AlgorithmInvalidEncodeTokenHasDefaultTimeTitle {- get {- return ResourceManager.GetString("AlgorithmInvalidEncodeTokenHasDefaultTimeTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The "amr" claim identifies the authentication method of the subject of the token..- /// </summary>- internal static string amr {- get {- return ResourceManager.GetString("amr", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The "appid" claim indicate the application ID of the client using the token. The application can act as itself or on behalf of a user. The application ID typically represents an application object, but it can also represent a service principal object in Microsoft Entra ID..- /// </summary>- internal static string appid {- get {- return ResourceManager.GetString("appid", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The "appidacr" claim indicate the authentication method of the client. For a public client, the value is 0. When you use the client ID and client secret, the value is 1. When you use a client certificate for authentication, the value is 2..- /// </summary>- internal static string appidacr {- get {- return ResourceManager.GetString("appidacr", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The "aud" (audience) claim identifies the recipients that the JWT is intended for. Each principal intended to process the JWT MUST identify itself with a value in the audience claim. If the principal processing the claim does not identify itself with a value in the "aud" claim when this claim is present, then the JWT MUST be rejected. In the general case, the "aud" value is an array of case- sensitive strings, each containing a StringOrURI value. In the special case when the JWT has one audience, the "aud" [rest of string was truncated]";.- /// </summary>- internal static string aud {- get {- return ResourceManager.GetString("aud", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The "azp" claim is a replacement for appid. The application ID of the client using the token. The application can act as itself or on behalf of a user. The application ID typically represents an application object, but it can also represent a service principal object in Microsoft Entra ID..- /// </summary>- internal static string azp {- get {- return ResourceManager.GetString("azp", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The "azpacr" claim is a replacement for appidacr. Indicates the authentication method of the client. For a public client, the value is 0. When you use the client ID and client secret, the value is 1. When you use a client certificate for authentication, the value is 2..- /// </summary>- internal static string azpacr {- get {- return ResourceManager.GetString("azpacr", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Description.- /// </summary>- internal static string ClaimDescriptionTitle {- get {- return ResourceManager.GetString("ClaimDescriptionTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Type.- /// </summary>- internal static string ClaimTypeTitle {- get {- return ResourceManager.GetString("ClaimTypeTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Value.- /// </summary>- internal static string ClaimValueTitle {- get {- return ResourceManager.GetString("ClaimValueTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Configuration.- /// </summary>- internal static string ConfigurationTitle {- get {- return ResourceManager.GetString("ConfigurationTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Decode.- /// </summary>- internal static string DecodeMode {- get {- return ResourceManager.GetString("DecodeMode", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Validate actors.- /// </summary>- internal static string DecodeValidateTokenActorsTitle {- get {- return ResourceManager.GetString("DecodeValidateTokenActorsTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Token audiences (separated by comma).- /// </summary>- internal static string DecodeValidateTokenAudiencesInputLabel {- get {- return ResourceManager.GetString("DecodeValidateTokenAudiencesInputLabel", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Validate audiences.- /// </summary>- internal static string DecodeValidateTokenAudiencesTitle {- get {- return ResourceManager.GetString("DecodeValidateTokenAudiencesTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Token issuer (separated by comma).- /// </summary>- internal static string DecodeValidateTokenIssuerInputLabel {- get {- return ResourceManager.GetString("DecodeValidateTokenIssuerInputLabel", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Validate issuer signing key.- /// </summary>- internal static string DecodeValidateTokenIssuerSigningKeyTitle {- get {- return ResourceManager.GetString("DecodeValidateTokenIssuerSigningKeyTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Validate issuer.- /// </summary>- internal static string DecodeValidateTokenIssuerTitle {- get {- return ResourceManager.GetString("DecodeValidateTokenIssuerTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Validate lifetime.- /// </summary>- internal static string DecodeValidateTokenLifetimeTitle {- get {- return ResourceManager.GetString("DecodeValidateTokenLifetimeTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Select which token parameters to validate.- /// </summary>- internal static string DecodeValidateTokenSettingsDescription {- get {- return ResourceManager.GetString("DecodeValidateTokenSettingsDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Token validation settings.- /// </summary>- internal static string DecodeValidateTokenSettingsTitle {- get {- return ResourceManager.GetString("DecodeValidateTokenSettingsTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Validate Token.- /// </summary>- internal static string DecodeValidateTokenTitle {- get {- return ResourceManager.GetString("DecodeValidateTokenTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Encode and decode Json Web Token .- /// </summary>- internal static string Description {- get {- return ResourceManager.GetString("Description", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Encode.- /// </summary>- internal static string EncodeMode {- get {- return ResourceManager.GetString("EncodeMode", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Token hashing algorithm.- /// </summary>- internal static string EncodeTokenAlgorithmTitle {- get {- return ResourceManager.GetString("EncodeTokenAlgorithmTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Token audience (separated by comma).- /// </summary>- internal static string EncodeTokenAudienceInputTitle {- get {- return ResourceManager.GetString("EncodeTokenAudienceInputTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Expire in day(s).- /// </summary>- internal static string EncodeTokenExpirationDayInputTitle {- get {- return ResourceManager.GetString("EncodeTokenExpirationDayInputTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Expire in hour(s).- /// </summary>- internal static string EncodeTokenExpirationHourInputTitle {- get {- return ResourceManager.GetString("EncodeTokenExpirationHourInputTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Expire in minute(s).- /// </summary>- internal static string EncodeTokenExpirationMinuteInputTitle {- get {- return ResourceManager.GetString("EncodeTokenExpirationMinuteInputTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Expire in month(s).- /// </summary>- internal static string EncodeTokenExpirationMonthInputTitle {- get {- return ResourceManager.GetString("EncodeTokenExpirationMonthInputTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Expire in year(s).- /// </summary>- internal static string EncodeTokenExpirationYearInputTitle {- get {- return ResourceManager.GetString("EncodeTokenExpirationYearInputTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Token has audience.- /// </summary>- internal static string EncodeTokenHasAudienceTitle {- get {- return ResourceManager.GetString("EncodeTokenHasAudienceTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Token has default time.- /// </summary>- internal static string EncodeTokenHasDefaultTimeTitle {- get {- return ResourceManager.GetString("EncodeTokenHasDefaultTimeTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Token has expiration.- /// </summary>- internal static string EncodeTokenHasExpirationTitle {- get {- return ResourceManager.GetString("EncodeTokenHasExpirationTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Token has issuer.- /// </summary>- internal static string EncodeTokenHasIssuerTitle {- get {- return ResourceManager.GetString("EncodeTokenHasIssuerTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Token issuer (separated by comma).- /// </summary>- internal static string EncodeTokenIssuerInputTitle {- get {- return ResourceManager.GetString("EncodeTokenIssuerInputTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Select token parameters.- /// </summary>- internal static string EncodeTokenSettingsDescription {- get {- return ResourceManager.GetString("EncodeTokenSettingsDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Settings.- /// </summary>- internal static string EncodeTokenSettingsTitle {- get {- return ResourceManager.GetString("EncodeTokenSettingsTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The "exp" (expiration time) claim identifies the expiration time on or after which the JWT MUST NOT be accepted for processing. The processing of the "exp" claim requires that the current date/time MUST be before the expiration date/time listed in the "exp" claim. Implementers MAY provide for some small leeway, usually no more than a few minutes, to account for clock skew. Its value MUST be a number containing a NumericDate value. Use of this claim is OPTIONAL..- /// </summary>- internal static string exp {- get {- return ResourceManager.GetString("exp", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The "groups" claim provides object IDs that represent the group memberships of the subject. The groupMembershipClaims property of the application manifest configures the groups claim on a per-application basis. A value of null excludes all groups, a value of SecurityGroup includes only Active Directory Security Group memberships, and a value of All includes both Security Groups and Microsoft 365 Distribution Lists.See the hasgroups claim for details on using the groups claim with the implicit grant. For oth [rest of string was truncated]";.- /// </summary>- internal static string groups {- get {- return ResourceManager.GetString("groups", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The "groups:src1" claim includes a link to the full groups list for the user when token requests are too large for the token. For JWTs as a distributed claim, for SAML as a new claim in place of the groups claim.Example JWT Value:"groups":"src1""_claim_sources: "src1" : { "endpoint" : "https://graph.microsoft.com/v1.0/users/{userID}/getMemberObjects" }.- /// </summary>- internal static string groups_src1 {- get {- return ResourceManager.GetString("groups:src1", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to If present, always true, indicates whether the user is in at least one group. Used in place of the groups claim for JWTs in implicit grant flows if the full groups claim would extend the URI fragment beyond the URL length limits (currently six or more groups). Indicates that the client should use the Microsoft Graph API to determine the groups (https://graph.microsoft.com/v1.0/users/{userID}/getMemberObjects) of the user..- /// </summary>- internal static string hasgroups {- get {- return ResourceManager.GetString("hasgroups", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Header.- /// </summary>- internal static string HeaderInputTitle {- get {- return ResourceManager.GetString("HeaderInputTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The "iat" (issued at) claim identifies the time at which the JWT was issued. This claim can be used to determine the age of the JWT. Its value MUST be a number containing a NumericDate value. Use of this claim is OPTIONAL..- /// </summary>- internal static string iat {- get {- return ResourceManager.GetString("iat", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The "idp" claim records the identity provider that authenticated the subject of the token. This value is identical to the value of the Issuer claim unless the user account isn't in the same tenant as the issuer, such as guests. Use the value of iss if the claim isn't present..- /// </summary>- internal static string idp {- get {- return ResourceManager.GetString("idp", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Expiartion Date is invalid.- /// </summary>- internal static string InvalidExpiration {- get {- return ResourceManager.GetString("InvalidExpiration", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Unable to process the token header.- /// </summary>- internal static string InvalidHeader {- get {- return ResourceManager.GetString("InvalidHeader", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Unable to process the token payload.- /// </summary>- internal static string InvalidPayload {- get {- return ResourceManager.GetString("InvalidPayload", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Private key is either null or empty.- /// </summary>- internal static string InvalidPrivateKey {- get {- return ResourceManager.GetString("InvalidPrivateKey", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Public key is either null or empty.- /// </summary>- internal static string InvalidPublicKey {- get {- return ResourceManager.GetString("InvalidPublicKey", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Unable to process the token signature.- /// </summary>- internal static string InvalidSignature {- get {- return ResourceManager.GetString("InvalidSignature", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The "iss" (issuer) claim identifies the principal that issued the JWT. The processing of this claim is generally application specific. The "iss" value is a case-sensitive string containing a StringOrURI value. Use of this claim is OPTIONAL..- /// </summary>- internal static string iss {- get {- return ResourceManager.GetString("iss", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The "jti" (JWT ID) claim provides a unique identifier for the JWT. The identifier value MUST be assigned in a manner that ensures that there is a negligible probability that the same value will be accidentally assigned to a different data object; if the application uses multiple issuers, collisions MUST be prevented among values produced by different issuers as well. The "jti" claim can be used to prevent the JWT from being replayed. The "jti" value is a case- sensitive string. Use of this claim is OPTIONAL [rest of string was truncated]";.- /// </summary>- internal static string jti {- get {- return ResourceManager.GetString("jti", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Specifies the thumbprint for the public key used for validating the signature of the token..- /// </summary>- internal static string kid {- get {- return ResourceManager.GetString("kid", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to JWT Encoder / Decoder.- /// </summary>- internal static string LongDisplayTitle {- get {- return ResourceManager.GetString("LongDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The "name" claim provides a human-readable value that identifies the subject of the token. The value can vary, it's mutable, and is for display purposes only. To receive this claim, use the profile scope..- /// </summary>- internal static string name {- get {- return ResourceManager.GetString("name", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The "nbf" (not before) claim identifies the time before which the JWT MUST NOT be accepted for processing. The processing of the "nbf" claim requires that the current date/time MUST be after or equal to the not-before date/time listed in the "nbf" claim. Implementers MAY provide for some small leeway, usually no more than a few minutes, to account for clock skew. Its value MUST be a number containing a NumericDate value. Use of this claim is OPTIONAL..- /// </summary>- internal static string nbf {- get {- return ResourceManager.GetString("nbf", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to No.- /// </summary>- internal static string No {- get {- return ResourceManager.GetString("No", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The immutable identifier for the requestor, which is the verified identity of the user or service principal. This ID uniquely identifies the requestor across applications. Two different applications signing in the same user receive the same value in the oid claim. The oid can be used when making queries to Microsoft online services, such as the Microsoft Graph. The Microsoft Graph returns this ID as the id property for a given user account. Because the oid allows multiple applications to correlate principal [rest of string was truncated]";.- /// </summary>- internal static string oid {- get {- return ResourceManager.GetString("oid", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Payload.- /// </summary>- internal static string PayloadInputTitle {- get {- return ResourceManager.GetString("PayloadInputTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The "preferred_username" claim indicate the primary username that represents the user. The value could be an email address, phone number, or a generic username without a specified format. Use the value for username hints and in human-readable UI as a username. To receive this claim, use the profile scope..- /// </summary>- internal static string preferred_username {- get {- return ResourceManager.GetString("preferred_username", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Private Key.- /// </summary>- internal static string PrivateKeyInputTitle {- get {- return ResourceManager.GetString("PrivateKeyInputTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to This type of privatec key is not supported.- /// </summary>- internal static string PrivateKeyNotSupported {- get {- return ResourceManager.GetString("PrivateKeyNotSupported", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Public Key.- /// </summary>- internal static string PublicKeyInputTitle {- get {- return ResourceManager.GetString("PublicKeyInputTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to This type of public key is not supported.- /// </summary>- internal static string PublicKeyNotSupported {- get {- return ResourceManager.GetString("PublicKeyNotSupported", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The "rh" claim is an internal claim used by Azure to revalidate tokens. Resources shouldn't use this claim..- /// </summary>- internal static string rh {- get {- return ResourceManager.GetString("rh", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The "roles" claim indicate the set of permissions exposed by the application that the requesting application or user has been given permission to call. The client credential flow uses this set of permission in place of user scopes for application tokens. For user tokens, this set of values contains the assigned roles of the user on the target application..- /// </summary>- internal static string roles {- get {- return ResourceManager.GetString("roles", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The "scp" claim indicate the set of scopes exposed by the application for which the client application has requested (and received) consent. Only included for user tokens..- /// </summary>- internal static string scp {- get {- return ResourceManager.GetString("scp", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to JWT.- /// </summary>- internal static string ShortDisplayTitle {- get {- return ResourceManager.GetString("ShortDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Signature.- /// </summary>- internal static string SignatureInputTitle {- get {- return ResourceManager.GetString("SignatureInputTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The "sub" (subject) claim identifies the principal that is the subject of the JWT. The claims in a JWT are normally statements about the subject. The subject value MUST either be scoped to be locally unique in the context of the issuer or be globally unique. The processing of this claim is generally application specific. The "sub" value is a case-sensitive string containing a StringOrURI value. Use of this claim is OPTIONAL..- /// </summary>- internal static string sub {- get {- return ResourceManager.GetString("sub", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The "tid" claim represents the tenant that the user is signing in to. For work and school accounts, the GUID is the immutable tenant ID of the organization that the user is signing in to..- /// </summary>- internal static string tid {- get {- return ResourceManager.GetString("tid", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Token.- /// </summary>- internal static string TokenInputTitle {- get {- return ResourceManager.GetString("TokenInputTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Token not validated (no parameters selected).- /// </summary>- internal static string TokenNotValidated {- get {- return ResourceManager.GetString("TokenNotValidated", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Select which mode you want to use.- /// </summary>- internal static string ToolModeDescription {- get {- return ResourceManager.GetString("ToolModeDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Tool Mode.- /// </summary>- internal static string ToolModeTitle {- get {- return ResourceManager.GetString("ToolModeTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Indicates the token type.- /// </summary>- internal static string typ {- get {- return ResourceManager.GetString("typ", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The "unique_name" claim provides a human readable value that identifies the subject of the token..- /// </summary>- internal static string unique_name {- get {- return ResourceManager.GetString("unique_name", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The "uti" claim (Token identifier claim), is equivalent to "jti" in the JWT specification. Unique, per-token identifier that is case-sensitive..- /// </summary>- internal static string uti {- get {- return ResourceManager.GetString("uti", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Audiences are empty or invalid.- /// </summary>- internal static string ValidAudiencesEmptyError {- get {- return ResourceManager.GetString("ValidAudiencesEmptyError", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Issuers are empty or invalid.- /// </summary>- internal static string ValidIssuersEmptyError {- get {- return ResourceManager.GetString("ValidIssuersEmptyError", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Token Validated.- /// </summary>- internal static string ValidToken {- get {- return ResourceManager.GetString("ValidToken", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The "ver" claim indicates the version of the access token..- /// </summary>- internal static string ver {- get {- return ResourceManager.GetString("ver", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The "wids" claim denotes the tenant-wide roles assigned to this user, from the section of roles present in Microsoft Entra built-in roles. The groupMembershipClaims property of the application manifest configures this claim on a per-application basis. Set the claim to All or DirectoryRole. May not be present in tokens obtained through the implicit flow due to token length concerns..- /// </summary>- internal static string wids {- get {- return ResourceManager.GetString("wids", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Functions the same as "kid". "x5t" is a legacy claim emitted only in v1.0 access tokens for compatibility purposes..- /// </summary>- internal static string x5t {- get {- return ResourceManager.GetString("x5t", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The "xms_cc" claim indicates whether the client application that acquired the token is capable of handling claims challenges. It's often used along with claim acrs. This claim is commonly used in Conditional Access and Continuous Access Evaluation scenarios. The resource server or service application that the token is issued for controls the presence of this claim in a token. A value of cp1 in the access token is the authoritative way to identify that a client application is capable of handling a claims cha [rest of string was truncated]";.- /// </summary>- internal static string xms_cc {- get {- return ResourceManager.GetString("xms_cc", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Yes.- /// </summary>- internal static string Yes {- get {- return ResourceManager.GetString("Yes", resourceCulture);- }- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/JsonWebToken/JsonWebTokenEncoderDecoder.resx b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/JsonWebToken/JsonWebTokenEncoderDecoder.resxdeleted file mode 100644index b8f268f90..000000000--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/JsonWebToken/JsonWebTokenEncoderDecoder.resx+++ /dev/null@@ -1,488 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<root>- <!--- Microsoft ResX Schema-- Version 2.0-- The primary goals of this format is to allow a simple XML format- that is mostly human readable. The generation and parsing of the- various data types are done through the TypeConverter classes- associated with the data types.-- Example:-- ... ado.net/XML headers & schema ...- <resheader name="resmimetype">text/microsoft-resx</resheader>- <resheader name="version">2.0</resheader>- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">- <value>[base64 mime encoded serialized .NET Framework object]</value>- </data>- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>- <comment>This is a comment</comment>- </data>-- There are any number of "resheader" rows that contain simple- name/value pairs.-- Each data row contains a name, and value. The row also contains a- type or mimetype. Type corresponds to a .NET class that support- text/value conversion through the TypeConverter architecture.- Classes that don't support this are serialized and stored with the- mimetype set.-- The mimetype is used for serialized objects, and tells the- ResXResourceReader how to depersist the object. This is currently not- extensible. For a given mimetype the value must be set accordingly:-- Note - application/x-microsoft.net.object.binary.base64 is the format- that the ResXResourceWriter will generate, however the reader can- read any of the formats listed below.-- mimetype: application/x-microsoft.net.object.binary.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.soap.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.bytearray.base64- value : The object must be serialized into a byte array- : using a System.ComponentModel.TypeConverter- : and then encoded with base64 encoding.- -->- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />- <xsd:element name="root" msdata:IsDataSet="true">- <xsd:complexType>- <xsd:choice maxOccurs="unbounded">- <xsd:element name="metadata">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" />- </xsd:sequence>- <xsd:attribute name="name" use="required" type="xsd:string" />- <xsd:attribute name="type" type="xsd:string" />- <xsd:attribute name="mimetype" type="xsd:string" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="assembly">- <xsd:complexType>- <xsd:attribute name="alias" type="xsd:string" />- <xsd:attribute name="name" type="xsd:string" />- </xsd:complexType>- </xsd:element>- <xsd:element name="data">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="resheader">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" />- </xsd:complexType>- </xsd:element>- </xsd:choice>- </xsd:complexType>- </xsd:element>- </xsd:schema>- <resheader name="resmimetype">- <value>text/microsoft-resx</value>- </resheader>- <resheader name="version">- <value>2.0</value>- </resheader>- <resheader name="reader">- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <resheader name="writer">- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <data name="AccessibleName" xml:space="preserve">- <value>JWT Encoder and Decoder tool</value>- <comment>Gui</comment>- </data>- <data name="acr" xml:space="preserve">- <value>The "acr" claim with a value of 0 indicates the end-user authentication didn't meet the requirements of ISO/IEC 29115.</value>- <comment>Claim (Microsoft)</comment>- </data>- <data name="acrs" xml:space="preserve">- <value>The "acrs" claim indicates the Auth Context IDs of the operations that the bearer is eligible to perform. Auth Context IDs can be used to trigger a demand for step-up authentication from within your application and services. Often used along with the xms_cc claim.</value>- <comment>Claim (Microsoft)</comment>- </data>- <data name="aio" xml:space="preserve">- <value>The "aio" claim is an internal claim used by Microsoft Entra ID to record data for token reuse. Resources shouldn't use this claim.</value>- <comment>Claim (Microsoft)</comment>- </data>- <data name="alg" xml:space="preserve">- <value>Indicates the algorithm used to sign the token</value>- <comment>Claim</comment>- </data>- <data name="AlgorithmInvalidEncodeTokenHasDefaultTimeTitle" xml:space="preserve">- <value>Unknown token algorithm</value>- <comment>Error message</comment>- </data>- <data name="amr" xml:space="preserve">- <value>The "amr" claim identifies the authentication method of the subject of the token.</value>- <comment>Claim (Microsoft)</comment>- </data>- <data name="appid" xml:space="preserve">- <value>The "appid" claim indicate the application ID of the client using the token. The application can act as itself or on behalf of a user. The application ID typically represents an application object, but it can also represent a service principal object in Microsoft Entra ID.</value>- <comment>Claim (Microsoft)</comment>- </data>- <data name="appidacr" xml:space="preserve">- <value>The "appidacr" claim indicate the authentication method of the client. For a public client, the value is 0. When you use the client ID and client secret, the value is 1. When you use a client certificate for authentication, the value is 2.</value>- <comment>Claim (Microsoft)</comment>- </data>- <data name="aud" xml:space="preserve">- <value>The "aud" (audience) claim identifies the recipients that the JWT is intended for. Each principal intended to process the JWT MUST identify itself with a value in the audience claim. If the principal processing the claim does not identify itself with a value in the "aud" claim when this claim is present, then the JWT MUST be rejected. In the general case, the "aud" value is an array of case- sensitive strings, each containing a StringOrURI value. In the special case when the JWT has one audience, the "aud" value MAY be a single case-sensitive string containing a StringOrURI value. The interpretation of audience values is generally application specific. Use of this claim is OPTIONAL.</value>- <comment>Claim</comment>- </data>- <data name="azp" xml:space="preserve">- <value>The "azp" claim is a replacement for appid. The application ID of the client using the token. The application can act as itself or on behalf of a user. The application ID typically represents an application object, but it can also represent a service principal object in Microsoft Entra ID.</value>- <comment>Claim (Microsoft)</comment>- </data>- <data name="azpacr" xml:space="preserve">- <value>The "azpacr" claim is a replacement for appidacr. Indicates the authentication method of the client. For a public client, the value is 0. When you use the client ID and client secret, the value is 1. When you use a client certificate for authentication, the value is 2.</value>- <comment>Claim (Microsoft)</comment>- </data>- <data name="ClaimDescriptionTitle" xml:space="preserve">- <value>Description</value>- <comment>Gui</comment>- </data>- <data name="ClaimTypeTitle" xml:space="preserve">- <value>Type</value>- <comment>Gui</comment>- </data>- <data name="ClaimValueTitle" xml:space="preserve">- <value>Value</value>- <comment>Gui</comment>- </data>- <data name="ConfigurationTitle" xml:space="preserve">- <value>Configuration</value>- <comment>Gui</comment>- </data>- <data name="DecodeMode" xml:space="preserve">- <value>Decode</value>- <comment>Gui</comment>- </data>- <data name="DecodeValidateTokenActorsTitle" xml:space="preserve">- <value>Validate actors</value>- <comment>Gui</comment>- </data>- <data name="DecodeValidateTokenAudiencesInputLabel" xml:space="preserve">- <value>Token audiences (separated by comma)</value>- <comment>Gui</comment>- </data>- <data name="DecodeValidateTokenAudiencesTitle" xml:space="preserve">- <value>Validate audiences</value>- <comment>Gui</comment>- </data>- <data name="DecodeValidateTokenIssuerInputLabel" xml:space="preserve">- <value>Token issuer (separated by comma)</value>- <comment>Gui</comment>- </data>- <data name="DecodeValidateTokenIssuerSigningKeyTitle" xml:space="preserve">- <value>Validate issuer signing key</value>- <comment>Gui</comment>- </data>- <data name="DecodeValidateTokenIssuerTitle" xml:space="preserve">- <value>Validate issuer</value>- <comment>Gui</comment>- </data>- <data name="DecodeValidateTokenLifetimeTitle" xml:space="preserve">- <value>Validate lifetime</value>- <comment>Gui</comment>- </data>- <data name="DecodeValidateTokenSettingsDescription" xml:space="preserve">- <value>Select which token parameters to validate</value>- <comment>Gui</comment>- </data>- <data name="DecodeValidateTokenSettingsTitle" xml:space="preserve">- <value>Token validation settings</value>- <comment>Gui</comment>- </data>- <data name="DecodeValidateTokenTitle" xml:space="preserve">- <value>Validate Token</value>- <comment>Gui</comment>- </data>- <data name="Description" xml:space="preserve">- <value>Encode and decode Json Web Token </value>- <comment>Gui</comment>- </data>- <data name="EncodeMode" xml:space="preserve">- <value>Encode</value>- <comment>Gui</comment>- </data>- <data name="EncodeTokenAlgorithmTitle" xml:space="preserve">- <value>Token hashing algorithm</value>- <comment>Gui</comment>- </data>- <data name="EncodeTokenAudienceInputTitle" xml:space="preserve">- <value>Token audience (separated by comma)</value>- <comment>Gui</comment>- </data>- <data name="EncodeTokenExpirationDayInputTitle" xml:space="preserve">- <value>Expire in day(s)</value>- <comment>Gui</comment>- </data>- <data name="EncodeTokenExpirationHourInputTitle" xml:space="preserve">- <value>Expire in hour(s)</value>- <comment>Gui</comment>- </data>- <data name="EncodeTokenExpirationMinuteInputTitle" xml:space="preserve">- <value>Expire in minute(s)</value>- <comment>Gui</comment>- </data>- <data name="EncodeTokenExpirationMonthInputTitle" xml:space="preserve">- <value>Expire in month(s)</value>- <comment>Gui</comment>- </data>- <data name="EncodeTokenExpirationYearInputTitle" xml:space="preserve">- <value>Expire in year(s)</value>- <comment>Gui</comment>- </data>- <data name="EncodeTokenHasAudienceTitle" xml:space="preserve">- <value>Token has audience</value>- <comment>Gui</comment>- </data>- <data name="EncodeTokenHasExpirationTitle" xml:space="preserve">- <value>Token has expiration</value>- <comment>Gui</comment>- </data>- <data name="EncodeTokenHasIssuerTitle" xml:space="preserve">- <value>Token has issuer</value>- <comment>Gui</comment>- </data>- <data name="EncodeTokenIssuerInputTitle" xml:space="preserve">- <value>Token issuer (separated by comma)</value>- <comment>Gui</comment>- </data>- <data name="EncodeTokenSettingsDescription" xml:space="preserve">- <value>Select token parameters</value>- <comment>Gui</comment>- </data>- <data name="EncodeTokenSettingsTitle" xml:space="preserve">- <value>Settings</value>- <comment>Gui</comment>- </data>- <data name="exp" xml:space="preserve">- <value>The "exp" (expiration time) claim identifies the expiration time on or after which the JWT MUST NOT be accepted for processing. The processing of the "exp" claim requires that the current date/time MUST be before the expiration date/time listed in the "exp" claim. Implementers MAY provide for some small leeway, usually no more than a few minutes, to account for clock skew. Its value MUST be a number containing a NumericDate value. Use of this claim is OPTIONAL.</value>- <comment>Claim</comment>- </data>- <data name="groups" xml:space="preserve">- <value>The "groups" claim provides object IDs that represent the group memberships of the subject. The groupMembershipClaims property of the application manifest configures the groups claim on a per-application basis. A value of null excludes all groups, a value of SecurityGroup includes only Active Directory Security Group memberships, and a value of All includes both Security Groups and Microsoft 365 Distribution Lists.See the hasgroups claim for details on using the groups claim with the implicit grant. For other flows, if the number of groups the user is in goes over 150 for SAML and 200 for JWT, then Microsoft Entra ID adds an overage claim to the claim sources. The claim sources point to the Microsoft Graph endpoint that contains the list of groups for the user.</value>- <comment>Claim (Microsoft)</comment>- </data>- <data name="groups:src1" xml:space="preserve">- <value>The "groups:src1" claim includes a link to the full groups list for the user when token requests are too large for the token. For JWTs as a distributed claim, for SAML as a new claim in place of the groups claim.Example JWT Value:"groups":"src1""_claim_sources: "src1" : { "endpoint" : "https://graph.microsoft.com/v1.0/users/{userID}/getMemberObjects" }</value>- <comment>Claim (Microsoft)</comment>- </data>- <data name="hasgroups" xml:space="preserve">- <value>If present, always true, indicates whether the user is in at least one group. Used in place of the groups claim for JWTs in implicit grant flows if the full groups claim would extend the URI fragment beyond the URL length limits (currently six or more groups). Indicates that the client should use the Microsoft Graph API to determine the groups (https://graph.microsoft.com/v1.0/users/{userID}/getMemberObjects) of the user.</value>- <comment>Claim (Microsoft)</comment>- </data>- <data name="HeaderInputTitle" xml:space="preserve">- <value>Header</value>- <comment>Gui</comment>- </data>- <data name="iat" xml:space="preserve">- <value>The "iat" (issued at) claim identifies the time at which the JWT was issued. This claim can be used to determine the age of the JWT. Its value MUST be a number containing a NumericDate value. Use of this claim is OPTIONAL.</value>- <comment>Claim</comment>- </data>- <data name="idp" xml:space="preserve">- <value>The "idp" claim records the identity provider that authenticated the subject of the token. This value is identical to the value of the Issuer claim unless the user account isn't in the same tenant as the issuer, such as guests. Use the value of iss if the claim isn't present.</value>- <comment>Claim (Microsoft)</comment>- </data>- <data name="InvalidExpiration" xml:space="preserve">- <value>Expiartion Date is invalid</value>- <comment>Error message</comment>- </data>- <data name="iss" xml:space="preserve">- <value>The "iss" (issuer) claim identifies the principal that issued the JWT. The processing of this claim is generally application specific. The "iss" value is a case-sensitive string containing a StringOrURI value. Use of this claim is OPTIONAL.</value>- <comment>Claim</comment>- </data>- <data name="jti" xml:space="preserve">- <value>The "jti" (JWT ID) claim provides a unique identifier for the JWT. The identifier value MUST be assigned in a manner that ensures that there is a negligible probability that the same value will be accidentally assigned to a different data object; if the application uses multiple issuers, collisions MUST be prevented among values produced by different issuers as well. The "jti" claim can be used to prevent the JWT from being replayed. The "jti" value is a case- sensitive string. Use of this claim is OPTIONAL.</value>- <comment>Claim</comment>- </data>- <data name="kid" xml:space="preserve">- <value>Specifies the thumbprint for the public key used for validating the signature of the token.</value>- <comment>Claim</comment>- </data>- <data name="LongDisplayTitle" xml:space="preserve">- <value>JWT Encoder / Decoder</value>- <comment>Gui</comment>- </data>- <data name="name" xml:space="preserve">- <value>The "name" claim provides a human-readable value that identifies the subject of the token. The value can vary, it's mutable, and is for display purposes only. To receive this claim, use the profile scope.</value>- <comment>Claim (Microsoft)</comment>- </data>- <data name="nbf" xml:space="preserve">- <value>The "nbf" (not before) claim identifies the time before which the JWT MUST NOT be accepted for processing. The processing of the "nbf" claim requires that the current date/time MUST be after or equal to the not-before date/time listed in the "nbf" claim. Implementers MAY provide for some small leeway, usually no more than a few minutes, to account for clock skew. Its value MUST be a number containing a NumericDate value. Use of this claim is OPTIONAL.</value>- <comment>Claim</comment>- </data>- <data name="No" xml:space="preserve">- <value>No</value>- <comment>Gui</comment>- </data>- <data name="oid" xml:space="preserve">- <value>The immutable identifier for the requestor, which is the verified identity of the user or service principal. This ID uniquely identifies the requestor across applications. Two different applications signing in the same user receive the same value in the oid claim. The oid can be used when making queries to Microsoft online services, such as the Microsoft Graph. The Microsoft Graph returns this ID as the id property for a given user account. Because the oid allows multiple applications to correlate principals, to receive this claim for users use the profile scope. If a single user exists in multiple tenants, the user contains a different object ID in each tenant. Even though the user logs into each account with the same credentials, the accounts are different.</value>- <comment>Claim (Microsoft)</comment>- </data>- <data name="PayloadInputTitle" xml:space="preserve">- <value>Payload</value>- <comment>Gui</comment>- </data>- <data name="preferred_username" xml:space="preserve">- <value>The "preferred_username" claim indicate the primary username that represents the user. The value could be an email address, phone number, or a generic username without a specified format. Use the value for username hints and in human-readable UI as a username. To receive this claim, use the profile scope.</value>- <comment>Claim (Microsoft)</comment>- </data>- <data name="PrivateKeyNotSupported" xml:space="preserve">- <value>This type of privatec key is not supported</value>- <comment>Error message</comment>- </data>- <data name="PublicKeyInputTitle" xml:space="preserve">- <value>Public Key</value>- <comment>Gui</comment>- </data>- <data name="PublicKeyNotSupported" xml:space="preserve">- <value>This type of public key is not supported</value>- <comment>Error message</comment>- </data>- <data name="rh" xml:space="preserve">- <value>The "rh" claim is an internal claim used by Azure to revalidate tokens. Resources shouldn't use this claim.</value>- <comment>Claim (Microsoft)</comment>- </data>- <data name="roles" xml:space="preserve">- <value>The "roles" claim indicate the set of permissions exposed by the application that the requesting application or user has been given permission to call. The client credential flow uses this set of permission in place of user scopes for application tokens. For user tokens, this set of values contains the assigned roles of the user on the target application.</value>- <comment>Claim (Microsoft)</comment>- </data>- <data name="scp" xml:space="preserve">- <value>The "scp" claim indicate the set of scopes exposed by the application for which the client application has requested (and received) consent. Only included for user tokens.</value>- <comment>Claim (Microsoft)</comment>- </data>- <data name="ShortDisplayTitle" xml:space="preserve">- <value>JWT</value>- <comment>Gui</comment>- </data>- <data name="SignatureInputTitle" xml:space="preserve">- <value>Signature</value>- <comment>Gui</comment>- </data>- <data name="sub" xml:space="preserve">- <value>The "sub" (subject) claim identifies the principal that is the subject of the JWT. The claims in a JWT are normally statements about the subject. The subject value MUST either be scoped to be locally unique in the context of the issuer or be globally unique. The processing of this claim is generally application specific. The "sub" value is a case-sensitive string containing a StringOrURI value. Use of this claim is OPTIONAL.</value>- <comment>Claim</comment>- </data>- <data name="tid" xml:space="preserve">- <value>The "tid" claim represents the tenant that the user is signing in to. For work and school accounts, the GUID is the immutable tenant ID of the organization that the user is signing in to.</value>- <comment>Claim (Microsoft)</comment>- </data>- <data name="TokenInputTitle" xml:space="preserve">- <value>Token</value>- <comment>Gui</comment>- </data>- <data name="TokenNotValidated" xml:space="preserve">- <value>Token not validated (no parameters selected)</value>- <comment>Error message</comment>- </data>- <data name="ToolModeDescription" xml:space="preserve">- <value>Select which mode you want to use</value>- <comment>Gui</comment>- </data>- <data name="ToolModeTitle" xml:space="preserve">- <value>Tool Mode</value>- <comment>Gui</comment>- </data>- <data name="typ" xml:space="preserve">- <value>Indicates the token type</value>- <comment>Claim</comment>- </data>- <data name="unique_name" xml:space="preserve">- <value>The "unique_name" claim provides a human readable value that identifies the subject of the token.</value>- <comment>Claim (Microsoft)</comment>- </data>- <data name="uti" xml:space="preserve">- <value>The "uti" claim (Token identifier claim), is equivalent to "jti" in the JWT specification. Unique, per-token identifier that is case-sensitive.</value>- <comment>Claim (Microsoft)</comment>- </data>- <data name="ValidAudiencesEmptyError" xml:space="preserve">- <value>Audiences are empty or invalid</value>- <comment>Error message</comment>- </data>- <data name="ValidIssuersEmptyError" xml:space="preserve">- <value>Issuers are empty or invalid</value>- <comment>Error message</comment>- </data>- <data name="ver" xml:space="preserve">- <value>The "ver" claim indicates the version of the access token.</value>- <comment>Claim (Microsoft)</comment>- </data>- <data name="wids" xml:space="preserve">- <value>The "wids" claim denotes the tenant-wide roles assigned to this user, from the section of roles present in Microsoft Entra built-in roles. The groupMembershipClaims property of the application manifest configures this claim on a per-application basis. Set the claim to All or DirectoryRole. May not be present in tokens obtained through the implicit flow due to token length concerns.</value>- <comment>Claim (Microsoft)</comment>- </data>- <data name="x5t" xml:space="preserve">- <value>Functions the same as "kid". "x5t" is a legacy claim emitted only in v1.0 access tokens for compatibility purposes.</value>- <comment>Claim</comment>- </data>- <data name="xms_cc" xml:space="preserve">- <value>The "xms_cc" claim indicates whether the client application that acquired the token is capable of handling claims challenges. It's often used along with claim acrs. This claim is commonly used in Conditional Access and Continuous Access Evaluation scenarios. The resource server or service application that the token is issued for controls the presence of this claim in a token. A value of cp1 in the access token is the authoritative way to identify that a client application is capable of handling a claims challenge.</value>- <comment>Claim (Microsoft)</comment>- </data>- <data name="Yes" xml:space="preserve">- <value>Yes</value>- <comment>Gui</comment>- </data>- <data name="EncodeTokenHasDefaultTimeTitle" xml:space="preserve">- <value>Token has default time</value>- <comment>Gui</comment>- </data>- <data name="InvalidHeader" xml:space="preserve">- <value>Unable to process the token header</value>- <comment>Error message</comment>- </data>- <data name="InvalidPayload" xml:space="preserve">- <value>Unable to process the token payload</value>- <comment>Error message</comment>- </data>- <data name="InvalidPrivateKey" xml:space="preserve">- <value>Private key is either null or empty</value>- <comment>Error message</comment>- </data>- <data name="InvalidPublicKey" xml:space="preserve">- <value>Public key is either null or empty</value>- <comment>Error message</comment>- </data>- <data name="PrivateKeyInputTitle" xml:space="preserve">- <value>Private Key</value>- <comment>Gui</comment>- </data>- <data name="ValidToken" xml:space="preserve">- <value>Token Validated</value>- <comment>Gui</comment>- </data>- <data name="InvalidSignature" xml:space="preserve">- <value>Unable to process the token signature</value>- <comment>Error message</comment>- </data>-</root>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/JsonWebToken/JsonWebTokenEncoderDecoderGuiTool.cs b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/JsonWebToken/JsonWebTokenEncoderDecoderGuiTool.csdeleted file mode 100644index 243a69d35..000000000--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/JsonWebToken/JsonWebTokenEncoderDecoderGuiTool.cs+++ /dev/null@@ -1,164 +0,0 @@-using DevToys.Tools.Models;-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.Tools.EncodersDecoders.JsonWebToken;--[Export(typeof(IGuiTool))]-[Name("JsonWebTokenEncoderDecoder")]-[ToolDisplayInformation(- IconFontName = "DevToys-Tools-Icons",- IconGlyph = '\u0110',- GroupName = PredefinedCommonToolGroupNames.EncodersDecoders,- ResourceManagerAssemblyIdentifier = nameof(DevToysToolsResourceManagerAssemblyIdentifier),- ResourceManagerBaseName = "DevToys.Tools.Tools.EncodersDecoders.JsonWebToken.JsonWebTokenEncoderDecoder",- ShortDisplayTitleResourceName = nameof(JsonWebTokenEncoderDecoder.ShortDisplayTitle),- LongDisplayTitleResourceName = nameof(JsonWebTokenEncoderDecoder.LongDisplayTitle),- DescriptionResourceName = nameof(JsonWebTokenEncoderDecoder.Description),- AccessibleNameResourceName = nameof(JsonWebTokenEncoderDecoder.AccessibleName))]-internal sealed partial class JsonWebTokenEncoderDecoderGuiTool : IGuiTool, IDisposable-{- /// <summary>- /// Whether the tool should encode or decode JWT Token.- /// </summary>- private static readonly SettingDefinition<JwtMode> toolModeSetting- = new(- name: $"{nameof(JsonWebTokenEncoderDecoderGuiTool)}.{nameof(toolModeSetting)}",- defaultValue: JwtMode.Decode);-- private readonly ILogger _logger;- private readonly ISettingsProvider _settingsProvider;- internal readonly JsonWebTokenDecoderGuiTool DecoderGuiTool;- internal readonly JsonWebTokenEncoderGuiTool EncoderGuiTool;-- private readonly IUISwitch _conversionModeSwitch = Switch("jwt-token-conversion-mode-switch");-- private readonly IUIGrid _jwtEncoderDecoderGuiGrid = Grid("jwt-encoder-decoder-grid");-- [ImportingConstructor]- public JsonWebTokenEncoderDecoderGuiTool(ISettingsProvider settingsProvider)- {- _logger = this.Log();- _settingsProvider = settingsProvider;- DecoderGuiTool = new(_settingsProvider);- EncoderGuiTool = new(_settingsProvider);-- JwtMode value = _settingsProvider.GetSetting(toolModeSetting);- if (value is JwtMode.Encode)- {- _conversionModeSwitch.On();- }- else- {- _conversionModeSwitch.Off();- }- LoadChildView();- }-- // For unit tests.- internal Task? WorkTask { get; private set; }-- public UIToolView View- => new(- isScrollable: true,- _jwtEncoderDecoderGuiGrid- .RowLargeSpacing()- .Rows(- (JsonWebTokenGridRows.Settings, Auto),- (JsonWebTokenGridRows.SubContainer, new UIGridLength(1, UIGridUnitType.Fraction))- )- .Columns(- (GridColumns.Stretch, new UIGridLength(1, UIGridUnitType.Fraction))- )- .Cells(- Cell(- JsonWebTokenGridRows.Settings,- GridColumns.Stretch,- Stack()- .Vertical()- .SmallSpacing()- .WithChildren(- Label()- .Text(JsonWebTokenEncoderDecoder.ConfigurationTitle),- Setting("jwt-token-conversion-mode-setting")- .Icon("FluentSystemIcons", '\uF18D')- .Title(JsonWebTokenEncoderDecoder.ToolModeTitle)- .Description(JsonWebTokenEncoderDecoder.ToolModeDescription)- .InteractiveElement(- _conversionModeSwitch- .OnText(JsonWebTokenEncoderDecoder.EncodeMode)- .OffText(JsonWebTokenEncoderDecoder.DecodeMode)- .OnToggle(OnConversionModeChanged)- )- )- ),- Cell(- JsonWebTokenGridRows.SubContainer,- GridColumns.Stretch,- Stack()- .Vertical()- .WithChildren(- DecoderGuiTool.ViewStack,- EncoderGuiTool.ViewStack- )- )- )- );-- public void OnDataReceived(string dataTypeName, object? parsedData)- {- throw new NotImplementedException();- }-- public void Dispose()- {- // Todo need to dispose child view too?- }-- private void OnConversionModeChanged(bool toolMode)- {- _settingsProvider.SetSetting(toolModeSetting, toolMode ? JwtMode.Encode : JwtMode.Decode);- LoadChildView();- }-- private IUIGridCell EncodeDecodeSettings()- => Cell(- JsonWebTokenGridRows.Settings,- GridColumns.Stretch,- Stack()- .Vertical()- .SmallSpacing()- .WithChildren(- Label()- .Text(JsonWebTokenEncoderDecoder.ConfigurationTitle),- Setting("jwt-token-conversion-mode-setting")- .Icon("FluentSystemIcons", '\uF18D')- .Title(JsonWebTokenEncoderDecoder.ToolModeTitle)- .Description(JsonWebTokenEncoderDecoder.ToolModeDescription)- .InteractiveElement(- _conversionModeSwitch- .OnText(JsonWebTokenEncoderDecoder.EncodeMode)- .OffText(JsonWebTokenEncoderDecoder.DecodeMode)- .OnToggle(OnConversionModeChanged)- )- )- );-- private void LoadChildView()- {- switch (_settingsProvider.GetSetting(toolModeSetting))- {- case JwtMode.Encode:- DecoderGuiTool.Hide();- EncoderGuiTool.Show();- break;-- case JwtMode.Decode:- EncoderGuiTool.Hide();- DecoderGuiTool.Show();- break;-- default:- throw new NotSupportedException();- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/JsonWebToken/JsonWebTokenEncoderDecoderLayoutEnums.cs b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/JsonWebToken/JsonWebTokenEncoderDecoderLayoutEnums.csdeleted file mode 100644index f135e6e2b..000000000--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/JsonWebToken/JsonWebTokenEncoderDecoderLayoutEnums.cs+++ /dev/null@@ -1,26 +0,0 @@-namespace DevToys.Tools.Tools.EncodersDecoders.JsonWebToken;--internal enum JsonWebTokenGridRows-{- Settings,- SubContainer-}--internal enum GridColumns-{- Stretch-}--internal enum JsonWebTokenExpirationGridRow-{- Content-}--internal enum JsonWebTokenExpirationGridColumn-{- Year,- Month,- Day,- Hour,- Minute-}diff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/JsonWebToken/JsonWebTokenEncoderGuiTool.cs b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/JsonWebToken/JsonWebTokenEncoderGuiTool.csdeleted file mode 100644index 3d4b248e9..000000000--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/JsonWebToken/JsonWebTokenEncoderGuiTool.cs+++ /dev/null@@ -1,605 +0,0 @@-using DevToys.Tools.Helpers;-using DevToys.Tools.Helpers.JsonWebToken;-using DevToys.Tools.Models;-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.Tools.EncodersDecoders.JsonWebToken;--internal sealed partial class JsonWebTokenEncoderGuiTool-{- /// <summary>- /// Define if the token algorithm- /// </summary>- private static readonly SettingDefinition<JsonWebTokenAlgorithm> tokenAlgorithmSetting- = new(- name: $"{nameof(JsonWebTokenEncoderGuiTool)}.{nameof(tokenAlgorithmSetting)}",- defaultValue: JsonWebTokenAlgorithm.HS256);-- /// <summary>- /// Define if the token has an issuer or not- /// </summary>- private static readonly SettingDefinition<bool> tokenHasIssuerSetting- = new(- name: $"{nameof(JsonWebTokenEncoderGuiTool)}.{nameof(tokenHasIssuerSetting)}",- defaultValue: false);-- /// <summary>- /// Define the issuer list- /// </summary>- private static readonly SettingDefinition<string> tokenIssuerSetting- = new(- name: $"{nameof(JsonWebTokenEncoderGuiTool)}.{nameof(tokenIssuerSetting)}",- defaultValue: string.Empty);-- /// <summary>- /// Define if the token has an audience or not- /// </summary>- private static readonly SettingDefinition<bool> tokenHasAudienceSetting- = new(- name: $"{nameof(JsonWebTokenEncoderGuiTool)}.{nameof(tokenHasAudienceSetting)}",- defaultValue: false);-- /// <summary>- /// Define the audience list- /// </summary>- private static readonly SettingDefinition<string> tokenAudienceSetting- = new(- name: $"{nameof(JsonWebTokenEncoderGuiTool)}.{nameof(tokenAudienceSetting)}",- defaultValue: string.Empty);-- /// <summary>- /// Define if the token has an expiration date or not- /// </summary>- private static readonly SettingDefinition<bool> tokenHasDefaultTimeSetting- = new(- name: $"{nameof(JsonWebTokenEncoderGuiTool)}.{nameof(tokenHasDefaultTimeSetting)}",- defaultValue: false);-- /// <summary>- /// Define if the token has an expiration date or not- /// </summary>- private static readonly SettingDefinition<bool> tokenHasExpirationSetting- = new(- name: $"{nameof(JsonWebTokenEncoderGuiTool)}.{nameof(tokenHasExpirationSetting)}",- defaultValue: false);-- /// <summary>- /// The Expiration to use.- /// </summary>- private static readonly SettingDefinition<DateTimeOffset> tokenExpirationSettings- = new(- name: $"{nameof(JsonWebTokenEncoderGuiTool)}.{nameof(tokenExpirationSettings)}",- defaultValue: DateTime.UtcNow);-- private readonly ILogger _logger;- private readonly ISettingsProvider _settingsProvider;-- private readonly IUIInfoBar _infoBar = InfoBar("jwt-encode-info-bar");- private readonly IUISwitch _encodeTokenHasIssuerSwitch = Switch("jwt-encode-token-issuer-switch");- private readonly IUISwitch _encodeTokenHasAudienceSwitch = Switch("jwt-encode-token-audience-switch");- private readonly IUISingleLineTextInput _encodeTokenIssuerInput = SingleLineTextInput("jwt-encode-token-issuer-input");- private readonly IUISingleLineTextInput _encodeTokenAudienceInput = SingleLineTextInput("jwt-encode-token-audience-input");-- private readonly IUISwitch _encodeTokenHasExpirationSwitch = Switch("jwt-encode-token-expiration-switch");- private readonly IUIGrid _encodeTokenExpirationGrid = Grid("jwt-encode-token-expiration-grid");- private readonly IUINumberInput _encodeTokenExpirationYearInputNumber = NumberInput("jwt-encode-token-expiration-input-year");- private readonly IUINumberInput _encodeTokenExpirationMonthInputNumber = NumberInput("jwt-encode-token-expiration-input-month");- private readonly IUINumberInput _encodeTokenExpirationDayInputNumber = NumberInput("jwt-encode-token-expiration-input-day");- private readonly IUINumberInput _encodeTokenExpirationHourInputNumber = NumberInput("jwt-encode-token-expiration-input-hour");- private readonly IUINumberInput _encodeTokenExpirationMinuteInputNumber = NumberInput("jwt-encode-token-expiration-input-minute");- private readonly IUINumberInput _encodeTokenExpirationSecondsInputNumber = NumberInput("jwt-encode-token-expiration-input-second");- private readonly IUINumberInput _encodeTokenExpirationMillisecondsInputNumber = NumberInput("jwt-encode-token-expiration-input-millisecond");-- private readonly IUISwitch _encodeTokenDefaultTimeSwitch = Switch("jwt-encode-token-default-time-switch");-- private readonly IUIStack _viewStack = Stack("jwt-encode-view-stack");- private readonly IUIStack _encodeSettingsStack = Stack("jwt-encode-settings-stack");-- private readonly IUIMultiLineTextInput _tokenInput = MultilineTextInput("jwt-encode-token-input");- private readonly IUIMultiLineTextInput _signatureInput = MultilineTextInput("jwt-encode-signature-input");- private readonly IUIMultiLineTextInput _privateKeyInput = MultilineTextInput("jwt-encode-private-key-input");- private readonly IUIMultiLineTextInput _headerInput = MultilineTextInput("jwt-encode-header-input", "json");- private readonly IUIMultiLineTextInput _payloadInput = MultilineTextInput("jwt-encode-payload-input", "json");-- private DisposableSemaphore _semaphore = new();- private CancellationTokenSource? _cancellationTokenSource;-- [ImportingConstructor]- public JsonWebTokenEncoderGuiTool(ISettingsProvider settingsProvider)- {- _logger = this.Log();- _settingsProvider = settingsProvider;- ConfigureUIAsync().Forget();- }-- internal Task? WorkTask { get; private set; }-- public IUIStack ViewStack- => _viewStack- .Vertical()- .WithChildren(- SettingGroup("jwt-encode-validate-token-setting")- .Icon("FluentSystemIcons", '\uec9e')- .Title(JsonWebTokenEncoderDecoder.EncodeTokenSettingsTitle)- .Description(JsonWebTokenEncoderDecoder.EncodeTokenSettingsDescription)- .WithChildren(- Setting("jwt-encode-token-algorithm-setting")- .Icon("FluentSystemIcons", '\uF1EE')- .Title(JsonWebTokenEncoderDecoder.EncodeTokenAlgorithmTitle)- .Handle(- _settingsProvider,- tokenAlgorithmSetting,- onOptionSelected: async (value) => await OnAlgorithmChangedAsync(value),- Item(JsonWebTokenAlgorithm.HS256),- Item(JsonWebTokenAlgorithm.HS384),- Item(JsonWebTokenAlgorithm.HS512),- Item(JsonWebTokenAlgorithm.RS256),- Item(JsonWebTokenAlgorithm.RS384),- Item(JsonWebTokenAlgorithm.RS512),- Item(JsonWebTokenAlgorithm.PS256),- Item(JsonWebTokenAlgorithm.PS384),- Item(JsonWebTokenAlgorithm.PS512),- Item(JsonWebTokenAlgorithm.ES256),- Item(JsonWebTokenAlgorithm.ES384),- Item(JsonWebTokenAlgorithm.ES512)- ),- SettingGroup("jwt-encode-token-issuer-setting-group")- .Icon("FluentSystemIcons", '\ue30a')- .Title(JsonWebTokenEncoderDecoder.EncodeTokenHasIssuerTitle)- .InteractiveElement(- _encodeTokenHasIssuerSwitch- .OnText(JsonWebTokenEncoderDecoder.Yes)- .OffText(JsonWebTokenEncoderDecoder.No)- .OnToggle(OnTokenHasIssuerChanged)- )- .WithChildren(- _encodeTokenIssuerInput- .Title(JsonWebTokenEncoderDecoder.EncodeTokenIssuerInputTitle)- .OnTextChanged(OnTokenIssuerInputChanged)- ),- SettingGroup("jwt-encode-token-audience-setting-group")- .Icon("FluentSystemIcons", '\ue30a')- .Title(JsonWebTokenEncoderDecoder.EncodeTokenHasAudienceTitle)- .InteractiveElement(- _encodeTokenHasAudienceSwitch- .OnText(JsonWebTokenEncoderDecoder.Yes)- .OffText(JsonWebTokenEncoderDecoder.No)- .OnToggle(OnTokenHasAudienceChanged)- )- .WithChildren(- _encodeTokenAudienceInput- .Title(JsonWebTokenEncoderDecoder.EncodeTokenAudienceInputTitle)- .OnTextChanged(OnTokenAudienceInputChanged)- ),- SettingGroup("jwt-encode-token-expiration-setting-group")- .Icon("FluentSystemIcons", '\ue243')- .Title(JsonWebTokenEncoderDecoder.EncodeTokenHasExpirationTitle)- .InteractiveElement(- _encodeTokenHasExpirationSwitch- .OnText(JsonWebTokenEncoderDecoder.Yes)- .OffText(JsonWebTokenEncoderDecoder.No)- .OnToggle(OnTokenHasExpirationChanged)- )- .WithChildren(- _encodeTokenExpirationGrid- .RowSmallSpacing()- .ColumnSmallSpacing()- .Rows(- (JsonWebTokenExpirationGridRow.Content, Auto)- )- .Columns(- (JsonWebTokenExpirationGridColumn.Year, new UIGridLength(1, UIGridUnitType.Fraction)),- (JsonWebTokenExpirationGridColumn.Month, new UIGridLength(1, UIGridUnitType.Fraction)),- (JsonWebTokenExpirationGridColumn.Day, new UIGridLength(1, UIGridUnitType.Fraction)),- (JsonWebTokenExpirationGridColumn.Hour, new UIGridLength(1, UIGridUnitType.Fraction)),- (JsonWebTokenExpirationGridColumn.Minute, new UIGridLength(1, UIGridUnitType.Fraction))- )- .Cells(- Cell(- JsonWebTokenExpirationGridRow.Content,- JsonWebTokenExpirationGridColumn.Year,- Stack()- .Vertical()- .SmallSpacing()- .WithChildren(- _encodeTokenExpirationYearInputNumber- .Title(JsonWebTokenEncoderDecoder.EncodeTokenExpirationYearInputTitle)- .HideCommandBar()- .OnTextChanged((value) =>- {- OnExpirationChanged(value, DateValueType.Year);- })- .Minimum(0)- .Maximum(9999)- )- ),- Cell(- JsonWebTokenExpirationGridRow.Content,- JsonWebTokenExpirationGridColumn.Month,- Stack()- .Vertical()- .SmallSpacing()- .WithChildren(- _encodeTokenExpirationMonthInputNumber- .Title(JsonWebTokenEncoderDecoder.EncodeTokenExpirationMonthInputTitle)- .HideCommandBar()- .OnTextChanged((value) =>- {- OnExpirationChanged(value, DateValueType.Month);- })- .Minimum(1)- .Maximum(12)- )- ),- Cell(- JsonWebTokenExpirationGridRow.Content,- JsonWebTokenExpirationGridColumn.Day,- Stack()- .Vertical()- .SmallSpacing()- .WithChildren(- _encodeTokenExpirationDayInputNumber- .Title(JsonWebTokenEncoderDecoder.EncodeTokenExpirationDayInputTitle)- .HideCommandBar()- .OnTextChanged((value) =>- {- OnExpirationChanged(value, DateValueType.Day);- })- .Minimum(1)- .Maximum(31)- )- ),- Cell(- JsonWebTokenExpirationGridRow.Content,- JsonWebTokenExpirationGridColumn.Hour,- Stack()- .Vertical()- .SmallSpacing()- .WithChildren(- _encodeTokenExpirationHourInputNumber- .Title(JsonWebTokenEncoderDecoder.EncodeTokenExpirationHourInputTitle)- .HideCommandBar()- .OnTextChanged((value) =>- {- OnExpirationChanged(value, DateValueType.Hour);- })- .Minimum(0)- .Maximum(24)- )- ),- Cell(- JsonWebTokenExpirationGridRow.Content,- JsonWebTokenExpirationGridColumn.Minute,- Stack()- .Vertical()- .SmallSpacing()- .WithChildren(- _encodeTokenExpirationMinuteInputNumber- .Title(JsonWebTokenEncoderDecoder.EncodeTokenExpirationMinuteInputTitle)- .HideCommandBar()- .OnTextChanged((value) =>- {- OnExpirationChanged(value, DateValueType.Minute);- })- .Minimum(0)- .Maximum(59)- )- )- )- ),- Setting("jwt-encode-token-default-time-setting")- .Icon("FluentSystemIcons", '\ue36e')- .Title(JsonWebTokenEncoderDecoder.EncodeTokenHasAudienceTitle)- .InteractiveElement(- _encodeTokenDefaultTimeSwitch- .OnText(JsonWebTokenEncoderDecoder.Yes)- .OffText(JsonWebTokenEncoderDecoder.No)- .OnToggle(OnTokenHasDefaultTimeChanged)- )- ),- _infoBar- .NonClosable(),- _tokenInput- .Title(JsonWebTokenEncoderDecoder.TokenInputTitle)- .ReadOnly(),- SplitGrid()- .Vertical()- .WithLeftPaneChild(- _headerInput- .Title(JsonWebTokenEncoderDecoder.HeaderInputTitle)- .Extendable()- .Language("json")- .OnTextChanged(OnTextInputChanged)- )- .WithRightPaneChild(- _payloadInput- .Title(JsonWebTokenEncoderDecoder.PayloadInputTitle)- .Extendable()- .Language("json")- .OnTextChanged(OnTextInputChanged)- ),- _signatureInput- .Title(JsonWebTokenEncoderDecoder.SignatureInputTitle)- .OnTextChanged(OnTextInputChanged),- _privateKeyInput- .Title(JsonWebTokenEncoderDecoder.PrivateKeyInputTitle)- .OnTextChanged(OnTextInputChanged)-- );-- public void Show()- {- _viewStack.Show();- _semaphore = new();- _cancellationTokenSource = new CancellationTokenSource();- }-- public void Hide()- {- _viewStack.Hide();- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _semaphore.Dispose();- }-- private void OnTokenHasIssuerChanged(bool tokenHasIssuer)- {- _settingsProvider.SetSetting(tokenHasIssuerSetting, tokenHasIssuer);- if (tokenHasIssuer)- {- _encodeTokenIssuerInput.Enable();- }- else- {- _encodeTokenIssuerInput.Disable();- }- StartTokenEncode();- }-- private ValueTask OnTokenIssuerInputChanged(string issuer)- {- _settingsProvider.SetSetting(tokenIssuerSetting, issuer);- StartTokenEncode();- return ValueTask.CompletedTask;- }-- private void OnTokenHasAudienceChanged(bool tokenHasAudience)- {- _settingsProvider.SetSetting(tokenHasAudienceSetting, tokenHasAudience);- if (tokenHasAudience)- {- _encodeTokenAudienceInput.Enable();- }- else- {- _encodeTokenAudienceInput.Disable();- }- StartTokenEncode();- }-- private ValueTask OnTokenAudienceInputChanged(string audience)- {- _settingsProvider.SetSetting(tokenAudienceSetting, audience);- StartTokenEncode();- return ValueTask.CompletedTask;- }-- private void OnTokenHasDefaultTimeChanged(bool tokenHasDefaultTime)- {- _settingsProvider.SetSetting(tokenHasDefaultTimeSetting, tokenHasDefaultTime);- StartTokenEncode();- }-- private void OnTokenHasExpirationChanged(bool tokenHasExpiration)- {- _settingsProvider.SetSetting(tokenHasExpirationSetting, tokenHasExpiration);- if (tokenHasExpiration)- {- _encodeTokenExpirationGrid.Enable();- }- else- {- _encodeTokenExpirationGrid.Disable();- }- StartTokenEncode();- }-- private void OnExpirationChanged(string value, DateValueType valueChanged)- {- DateTimeOffset epochToUse = _settingsProvider.GetSetting(tokenExpirationSettings);-- ResultInfo<DateTimeOffset> result = DateHelper.ChangeDateTime(- Convert.ToInt32(value),- epochToUse,- TimeZoneInfo.Utc,- valueChanged);-- _settingsProvider.SetSetting(tokenExpirationSettings, result.Data);- StartTokenEncode();- }-- private async Task OnAlgorithmChangedAsync(JsonWebTokenAlgorithm algorithm)- {- _settingsProvider.SetSetting(tokenAlgorithmSetting, algorithm);- await ConfigureTokenAlgorithmUIAsync(algorithm);- StartTokenEncode();- }-- private void OnTokenDefaultTimeChanged(bool tokenHasDefaultTime)- {- _settingsProvider.SetSetting(tokenHasDefaultTimeSetting, tokenHasDefaultTime);- StartTokenEncode();- }-- private void OnTextInputChanged(string text)- {- StartTokenEncode();- }-- private void StartTokenEncode()- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _cancellationTokenSource = new CancellationTokenSource();-- if (string.IsNullOrWhiteSpace(_payloadInput.Text))- {- ClearUI();- return;- }-- JsonWebTokenAlgorithm tokenAlgorithm = _settingsProvider.GetSetting(tokenAlgorithmSetting);- TokenParameters tokenParameters = new()- {- Payload = _payloadInput.Text,- TokenAlgorithm = tokenAlgorithm- };- EncoderParameters encoderParameters = new()- {- HasDefaultTime = _settingsProvider.GetSetting(tokenHasDefaultTimeSetting)- };- bool hasAudience = _settingsProvider.GetSetting(tokenHasAudienceSetting);- if (hasAudience)- {- encoderParameters.HasAudience = hasAudience;- tokenParameters.Audiences = _settingsProvider.GetSetting(tokenAudienceSetting).Split(',').ToHashSet();- }- bool hasIssuer = _settingsProvider.GetSetting(tokenHasIssuerSetting);- if (hasIssuer)- {- encoderParameters.HasIssuer = hasIssuer;- tokenParameters.Issuers = _settingsProvider.GetSetting(tokenIssuerSetting).Split(',').ToHashSet();- }- bool hasExpiration = _settingsProvider.GetSetting(tokenHasAudienceSetting);- if (hasExpiration)- {- DateTimeOffset dateTimeOffset = _settingsProvider.GetSetting(tokenExpirationSettings);- encoderParameters.HasExpiration = hasExpiration;- tokenParameters.DefineExpirationDate(dateTimeOffset);- }-- if (tokenAlgorithm is JsonWebTokenAlgorithm.HS256 ||- tokenAlgorithm is JsonWebTokenAlgorithm.HS384 ||- tokenAlgorithm is JsonWebTokenAlgorithm.HS512)- {- tokenParameters.Signature = _signatureInput.Text;- }- else- {- tokenParameters.PrivateKey = _privateKeyInput.Text;- }-- WorkTask = EncodeTokenAsync(- encoderParameters,- tokenParameters,- _cancellationTokenSource.Token);- }-- private async Task EncodeTokenAsync(- EncoderParameters encoderParameters,- TokenParameters tokenParameters,- CancellationToken cancellationToken)- {- using (await _semaphore.WaitAsync(cancellationToken))- {- ResultInfo<JsonWebTokenResult?, ResultInfoSeverity> result = JsonWebTokenEncoderHelper.GenerateToken(- encoderParameters,- tokenParameters,- _logger);-- switch (result.Severity)- {- case ResultInfoSeverity.Success:- _infoBar.Close();- _tokenInput.Text(result.Data!.Token!);- break;-- case ResultInfoSeverity.Warning:- _headerInput.Text(result.Data!.Header!);- _payloadInput.Text(result.Data!.Payload!);- _infoBar- .Description(result.ErrorMessage)- .Warning()- .Open();- break;-- case ResultInfoSeverity.Error:- _infoBar- .Description(result.ErrorMessage)- .Error()- .Open();- ClearUI();- break;-- default:- throw new NotImplementedException();- }- }- }-- private void ClearUI()- {- _infoBar.Close();- _tokenInput.Text(string.Empty);- }-- private async Task ConfigureUIAsync()- {- JsonWebTokenAlgorithm tokenAlgorithm = _settingsProvider.GetSetting(tokenAlgorithmSetting);- await ConfigureTokenAlgorithmUIAsync(tokenAlgorithm);-- ConfigureSwitch(_settingsProvider.GetSetting(tokenHasIssuerSetting), _encodeTokenHasIssuerSwitch, _encodeTokenIssuerInput);- ConfigureSwitch(_settingsProvider.GetSetting(tokenHasAudienceSetting), _encodeTokenHasAudienceSwitch, _encodeTokenAudienceInput);- ConfigureSwitch(_settingsProvider.GetSetting(tokenHasExpirationSetting), _encodeTokenHasExpirationSwitch, _encodeTokenExpirationGrid);- ConfigureSwitch(_settingsProvider.GetSetting(tokenHasDefaultTimeSetting), _encodeTokenDefaultTimeSwitch);- DateTimeOffset expirationDate = _settingsProvider.GetSetting(tokenExpirationSettings);- _encodeTokenExpirationYearInputNumber.Value(expirationDate.Year);- _encodeTokenExpirationMonthInputNumber.Value(expirationDate.Month);- _encodeTokenExpirationDayInputNumber.Value(expirationDate.Day);- _encodeTokenExpirationHourInputNumber.Value(expirationDate.Hour);- _encodeTokenExpirationMinuteInputNumber.Value(expirationDate.Minute);- }-- private async Task ConfigureTokenAlgorithmUIAsync(JsonWebTokenAlgorithm tokenAlgorithm)- {- if (tokenAlgorithm is JsonWebTokenAlgorithm.HS256 ||- tokenAlgorithm is JsonWebTokenAlgorithm.HS384 ||- tokenAlgorithm is JsonWebTokenAlgorithm.HS512)- {- _signatureInput.Show();- _privateKeyInput.Hide();- }- else- {- _signatureInput.Hide();- _privateKeyInput.Show();- }-- ResultInfo<string> headerContent = await JsonHelper.FormatAsync(- @"{""alg"": """ + tokenAlgorithm.ToString() + @""", ""typ"": ""JWT""}",- Indentation.TwoSpaces,- false,- _logger,- CancellationToken.None);-- _headerInput.Text(headerContent.Data!);- }-- private static void ConfigureSwitch(bool value, IUISwitch inputSwitch, IUIElementWithChildren? input = null)- {- if (value)- {- inputSwitch.On();- if (input != null)- {- input.Enable();- }- return;- }- inputSwitch.Off();- if (input != null)- {- input.Disable();- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/QRCode/QRCodeEncoderDecoder.Designer.cs b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/QRCode/QRCodeEncoderDecoder.Designer.csdeleted file mode 100644index e8d522ae7..000000000--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/QRCode/QRCodeEncoderDecoder.Designer.cs+++ /dev/null@@ -1,162 +0,0 @@-//-------------------------------------------------------------------------------// <auto-generated>-// This code was generated by a tool.-// Runtime Version:4.0.30319.42000-//-// Changes to this file may cause incorrect behavior and will be lost if-// the code is regenerated.-// </auto-generated>-//--------------------------------------------------------------------------------namespace DevToys.Tools.Tools.EncodersDecoders.QRCode {- using System;--- /// <summary>- /// A strongly-typed resource class, for looking up localized strings, etc.- /// </summary>- // This class was auto-generated by the StronglyTypedResourceBuilder- // class via a tool like ResGen or Visual Studio.- // To add or remove a member, edit your .ResX file then rerun ResGen- // with the /str option, or rebuild your VS project.- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]- internal class QRCodeEncoderDecoder {-- private static global::System.Resources.ResourceManager resourceMan;-- private static global::System.Globalization.CultureInfo resourceCulture;-- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]- internal QRCodeEncoderDecoder() {- }-- /// <summary>- /// Returns the cached ResourceManager instance used by this class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Resources.ResourceManager ResourceManager {- get {- if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Tools.Tools.EncodersDecoders.QRCode.QRCodeEncoderDecoder", typeof(QRCodeEncoderDecoder).Assembly);- resourceMan = temp;- }- return resourceMan;- }- }-- /// <summary>- /// Overrides the current thread's CurrentUICulture property for all- /// resource lookups using this strongly typed resource class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Globalization.CultureInfo Culture {- get {- return resourceCulture;- }- set {- resourceCulture = value;- }- }-- /// <summary>- /// Looks up a localized string similar to QR Code Encoder and Decoder tool.- /// </summary>- internal static string AccessibleName {- get {- return ResourceManager.GetString("AccessibleName", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Read or generate a QR Code from a text. Can be exported as SVG..- /// </summary>- internal static string Description {- get {- return ResourceManager.GetString("Description", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Export as SVG.- /// </summary>- internal static string ExportAsSvgButtonTitle {- get {- return ResourceManager.GetString("ExportAsSvgButtonTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to QR Code.- /// </summary>- internal static string ImageWithQrCode {- get {- return ResourceManager.GetString("ImageWithQrCode", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Image file path containing a QR Code to decode / text file path containing the text to convert to a QR Code.- /// </summary>- internal static string InputOptionDescription {- get {- return ResourceManager.GetString("InputOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Text.- /// </summary>- internal static string InputText {- get {- return ResourceManager.GetString("InputText", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to QR Code Encoder / Decoder.- /// </summary>- internal static string LongDisplayTitle {- get {- return ResourceManager.GetString("LongDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to No QR Code found in this image.- /// </summary>- internal static string NoQrCodeFound {- get {- return ResourceManager.GetString("NoQrCodeFound", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Path to the output file.- /// </summary>- internal static string OutputFileOptionDescription {- get {- return ResourceManager.GetString("OutputFileOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to QRCode URL.- /// </summary>- internal static string SearchKeywords {- get {- return ResourceManager.GetString("SearchKeywords", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to QR Code.- /// </summary>- internal static string ShortDisplayTitle {- get {- return ResourceManager.GetString("ShortDisplayTitle", resourceCulture);- }- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/QRCode/QRCodeEncoderDecoderCommandLineTool.cs b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/QRCode/QRCodeEncoderDecoderCommandLineTool.csdeleted file mode 100644index 1f93afb42..000000000--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/QRCode/QRCodeEncoderDecoderCommandLineTool.cs+++ /dev/null@@ -1,151 +0,0 @@-using DevToys.Tools.Helpers;-using DevToys.Tools.SmartDetection;-using DevToys.Tools.Strings.GlobalStrings;-using Microsoft.Extensions.Logging;-using OneOf;-using SixLabors.ImageSharp;-using SixLabors.ImageSharp.PixelFormats;--namespace DevToys.Tools.Tools.EncodersDecoders.QRCode;--[Export(typeof(ICommandLineTool))]-[Name("QRCodeEncoderDecoder")]-[CommandName(- Name = "qrcode",- ResourceManagerBaseName = "DevToys.Tools.Tools.EncodersDecoders.QRCode.QRCodeEncoderDecoder",- DescriptionResourceName = nameof(QRCodeEncoderDecoder.Description))]-internal class QRCodeEncoderDecoderCommandLineTool : ICommandLineTool-{- private readonly Lazy<string[]> _supportedFileTypes- = new(() =>- {- var extensions = new List<string>(StaticImageFileDataTypeDetector.SupportedFileTypes);- extensions.Add(".svg");- return extensions.ToArray();- });--#pragma warning disable IDE0044 // Add readonly modifier- [Import]- private IFileStorage _fileStorage = null!;-#pragma warning restore IDE0044 // Add readonly modifier-- [CommandLineOption(- Name = "input",- Alias = "i",- IsRequired = true,- DescriptionResourceName = nameof(QRCodeEncoderDecoder.InputOptionDescription))]- internal OneOf<FileInfo, string>? Input { get; set; }-- [CommandLineOption(- Name = "outputFile",- Alias = "o",- DescriptionResourceName = nameof(QRCodeEncoderDecoder.OutputFileOptionDescription))]- internal FileInfo? OutputFile { get; set; }-- public async ValueTask<int> InvokeAsync(ILogger logger, CancellationToken cancellationToken)- {- if (!Input.HasValue)- {- return -1;- }-- return await Input.Value.Match(- async file =>- {- if (!file.Exists)- {- Console.Error.WriteLine(string.Format(GlobalStrings.FileNotFound, file.FullName));- return -1;- }-- string fileExtension = file.Extension;- bool isImageFile = StaticImageFileDataTypeDetector.SupportedFileTypes.Any(ext => ext.Equals(fileExtension, StringComparison.OrdinalIgnoreCase));- if (isImageFile)- {- await DecodeQRCodeAsync(file, cancellationToken);- }- else- {- string text = await File.ReadAllTextAsync(file.FullName, cancellationToken);- return await EncodeQRCodeAsync(text, cancellationToken);- }-- return 0;- },- async text => await EncodeQRCodeAsync(text, cancellationToken));- }-- private async ValueTask<int> EncodeQRCodeAsync(string input, CancellationToken cancellationToken)- {- try- {- if (string.IsNullOrWhiteSpace(input))- {- return -1;- }-- string filePath;- if (OutputFile is null)- {- using FileStream? fileStream = await _fileStorage.PickSaveFileAsync(_supportedFileTypes.Value);- if (fileStream is null)- {- return -1;- }-- filePath = fileStream.Name;- }- else- {- filePath = OutputFile.FullName;- }-- if (cancellationToken.IsCancellationRequested)- {- return -1;- }-- if (File.Exists(filePath))- {- File.Delete(filePath);- }-- if (Path.GetExtension(filePath).Equals(".svg", StringComparison.OrdinalIgnoreCase))- {- string svg = QrCodeHelper.GenerateSvgQrCode(input);- using var fileWriter = new StreamWriter(filePath);- await fileWriter.WriteAsync(svg);- }- else- {- using Image<Rgba32> image = QrCodeHelper.GenerateQrCode(input);- await image.SaveAsync(filePath, cancellationToken);- }-- return 0;- }- catch- {- return -1;- }- finally- {- }- }-- private async ValueTask<int> DecodeQRCodeAsync(FileInfo file, CancellationToken cancellationToken)- {- using Stream stream = _fileStorage.OpenReadFile(file.FullName);-- string output = await QrCodeHelper.ReadQrCodeAsync(stream, cancellationToken);-- if (string.IsNullOrEmpty(output))- {- Console.Error.WriteLine(QRCodeEncoderDecoder.NoQrCodeFound);- return -1;- }-- await FileHelper.WriteOutputAsync(output, OutputFile, cancellationToken);- return 0;- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/QRCode/QRCodeEncoderDecoderGuiTool.cs b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/QRCode/QRCodeEncoderDecoderGuiTool.csdeleted file mode 100644index 68ee24e6e..000000000--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/QRCode/QRCodeEncoderDecoderGuiTool.cs+++ /dev/null@@ -1,223 +0,0 @@-using DevToys.Tools.Helpers;-using Microsoft.Extensions.Logging;-using SixLabors.ImageSharp;-using SixLabors.ImageSharp.PixelFormats;-using ZXing;-using ZXing.Common;-using ZXing.QrCode.Internal;-using ZXing.Rendering;-using static ZXing.Rendering.SvgRenderer;--namespace DevToys.Tools.Tools.EncodersDecoders.QRCode;--[Export(typeof(IGuiTool))]-[Name("QRCodeEncoderDecoder")]-[ToolDisplayInformation(- IconFontName = "FluentSystemIcons",- IconGlyph = '\uE9EC',- GroupName = PredefinedCommonToolGroupNames.EncodersDecoders,- ResourceManagerAssemblyIdentifier = nameof(DevToysToolsResourceManagerAssemblyIdentifier),- ResourceManagerBaseName = "DevToys.Tools.Tools.EncodersDecoders.QRCode.QRCodeEncoderDecoder",- ShortDisplayTitleResourceName = nameof(QRCodeEncoderDecoder.ShortDisplayTitle),- LongDisplayTitleResourceName = nameof(QRCodeEncoderDecoder.LongDisplayTitle),- DescriptionResourceName = nameof(QRCodeEncoderDecoder.Description),- AccessibleNameResourceName = nameof(QRCodeEncoderDecoder.AccessibleName),- SearchKeywordsResourceName = nameof(QRCodeEncoderDecoder.SearchKeywords))]-[AcceptedDataTypeName(PredefinedCommonDataTypeNames.Image)]-[AcceptedDataTypeName(PredefinedCommonDataTypeNames.Text)]-internal sealed partial class QRCodeEncoderDecoderGuiTool : IGuiTool, IDisposable-{- private enum GridRows- {- FileInput,- ImagePreviewer- }-- private enum GridColumns- {- Stretch- }-- private readonly DisposableSemaphore _semaphore = new();- private readonly IFileStorage _fileStorage;- private readonly ILogger _logger;- private readonly IUIMultiLineTextInput _inputText = MultilineTextInput("qrcode-input-box");- private readonly IUIFileSelector _fileSelector = FileSelector("qrcode-file-selector");- private readonly IUIImageViewer _imageViewer = ImageViewer("qrcode-preview");- private readonly IUIButton _exportAsSvgButton = Button("qrcode-export-as-svg-button");-- private SandboxedFileReader? _selectedFile;- private CancellationTokenSource? _cancellationTokenSource;- private bool _ignoreTextChange;-- [ImportingConstructor]- public QRCodeEncoderDecoderGuiTool(IFileStorage fileStorage)- {- _fileStorage = fileStorage;- _logger = this.Log();- }-- // For unit tests.- internal Task? WorkTask { get; private set; }-- public UIToolView View- => new(- isScrollable: true,- SplitGrid()- .Vertical()- .LeftPaneLength(new UIGridLength(4, UIGridUnitType.Fraction))- .RightPaneLength(new UIGridLength(2, UIGridUnitType.Fraction))-- .WithLeftPaneChild(- _inputText- .Title(QRCodeEncoderDecoder.InputText)- .AlwaysWrap()- .CanCopyWhenEditable()- .OnTextChanged(OnInputTextChanged))-- .WithRightPaneChild(- Grid()- .RowLargeSpacing()-- .Rows(- (GridRows.FileInput, Auto),- (GridRows.ImagePreviewer, new UIGridLength(1, UIGridUnitType.Fraction)))-- .Columns(- (GridColumns.Stretch, new UIGridLength(1, UIGridUnitType.Fraction)))-- .Cells(- Cell(- GridRows.FileInput,- GridColumns.Stretch,-- _fileSelector- .CanSelectOneFile()- .LimitFileTypesToImages()- .OnFilesSelected(OnFileSelectedAsync)),-- Cell(- GridRows.ImagePreviewer,- GridColumns.Stretch,-- _imageViewer- .Title(QRCodeEncoderDecoder.ImageWithQrCode)- .ManuallyHandleSaveAs("svg", OnSaveAsSvgAsync)))));-- public async void OnDataReceived(string dataTypeName, object? parsedData)- {- if (dataTypeName == PredefinedCommonDataTypeNames.Text && parsedData is string text)- {- _inputText.Text(text); // This will trigger a conversion.- }- else if (dataTypeName == PredefinedCommonDataTypeNames.Image && parsedData is Image<Rgba32> image)- {- FileInfo temporaryFile = _fileStorage.CreateSelfDestroyingTempFile("png");-- using (image)- {- using Stream fileStream = _fileStorage.OpenWriteFile(temporaryFile.FullName, replaceIfExist: true);- await image.SaveAsPngAsync(fileStream);- }-- _fileSelector.WithFiles(SandboxedFileReader.FromFileInfo(temporaryFile)); // This will trigger a conversion.- }- }-- public void Dispose()- {- _selectedFile?.Dispose();- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _semaphore.Dispose();- }-- private async ValueTask OnSaveAsSvgAsync(FileStream fileStream)- {- string svg = QrCodeHelper.GenerateSvgQrCode(_inputText.Text);- using var fileWriter = new StreamWriter(fileStream);- await fileWriter.WriteAsync(svg);- }-- private void OnInputTextChanged(string text)- {- if (!_ignoreTextChange)- {- StartConvert(text);- }- }-- private ValueTask OnFileSelectedAsync(SandboxedFileReader[] files)- {- Guard.HasSizeEqualTo(files, 1);-- _selectedFile?.Dispose();- _selectedFile = files[0];- _imageViewer.WithPickedFile(_selectedFile, false);-- StartConvert(_selectedFile);- return ValueTask.CompletedTask;- }-- private void StartConvert(SandboxedFileReader file)- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _cancellationTokenSource = new CancellationTokenSource();-- WorkTask = DecodeQRCodeAsync(file, _cancellationTokenSource.Token);- }-- private void StartConvert(string text)- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _cancellationTokenSource = new CancellationTokenSource();-- WorkTask = EncodeQRCodeAsync(text, _cancellationTokenSource.Token);- }-- private async Task EncodeQRCodeAsync(string input, CancellationToken cancellationToken)- {- await TaskSchedulerAwaiter.SwitchOffMainThreadAsync(cancellationToken);-- try- {- using (await _semaphore.WaitAsync(cancellationToken))- {- if (string.IsNullOrWhiteSpace(input))- {- _imageViewer.Clear();- return;- }-- Image<Rgba32> image = QrCodeHelper.GenerateQrCode(input); // Do not dispose the image. Will be disposed by the image viewer when the image is replaced.-- _imageViewer.WithImage(image, disposeAutomatically: true);- _exportAsSvgButton.Enable();- }- }- catch- {- _imageViewer.Clear();- }- }-- private async Task DecodeQRCodeAsync(SandboxedFileReader file, CancellationToken cancellationToken)- {- _exportAsSvgButton.Disable();-- await TaskSchedulerAwaiter.SwitchOffMainThreadAsync(cancellationToken);-- using (await _semaphore.WaitAsync(cancellationToken))- {- using Stream stream = await file.GetNewAccessToFileContentAsync(cancellationToken);-- string output = await QrCodeHelper.ReadQrCodeAsync(stream, cancellationToken);-- _ignoreTextChange = true;- _inputText.Text(output);- _ignoreTextChange = false;- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Url/UrlEncoderDecoder.Designer.cs b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Url/UrlEncoderDecoder.Designer.csdeleted file mode 100644index ffd6b3fd1..000000000--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Url/UrlEncoderDecoder.Designer.cs+++ /dev/null@@ -1,180 +0,0 @@-//-------------------------------------------------------------------------------// <auto-generated>-// This code was generated by a tool.-// Runtime Version:4.0.30319.42000-//-// Changes to this file may cause incorrect behavior and will be lost if-// the code is regenerated.-// </auto-generated>-//--------------------------------------------------------------------------------namespace DevToys.Tools.Tools.EncodersDecoders.Url {- using System;--- /// <summary>- /// A strongly-typed resource class, for looking up localized strings, etc.- /// </summary>- // This class was auto-generated by the StronglyTypedResourceBuilder- // class via a tool like ResGen or Visual Studio.- // To add or remove a member, edit your .ResX file then rerun ResGen- // with the /str option, or rebuild your VS project.- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]- internal class UrlEncoderDecoder {-- private static global::System.Resources.ResourceManager resourceMan;-- private static global::System.Globalization.CultureInfo resourceCulture;-- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]- internal UrlEncoderDecoder() {- }-- /// <summary>- /// Returns the cached ResourceManager instance used by this class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Resources.ResourceManager ResourceManager {- get {- if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Tools.Tools.EncodersDecoders.Url.UrlEncoderDecoder", typeof(UrlEncoderDecoder).Assembly);- resourceMan = temp;- }- return resourceMan;- }- }-- /// <summary>- /// Overrides the current thread's CurrentUICulture property for all- /// resource lookups using this strongly typed resource class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Globalization.CultureInfo Culture {- get {- return resourceCulture;- }- set {- resourceCulture = value;- }- }-- /// <summary>- /// Looks up a localized string similar to URL Encoder and Decoder tool.- /// </summary>- internal static string AccessibleName {- get {- return ResourceManager.GetString("AccessibleName", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Configuration.- /// </summary>- internal static string ConfigurationTitle {- get {- return ResourceManager.GetString("ConfigurationTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Decode.- /// </summary>- internal static string ConversionDecode {- get {- return ResourceManager.GetString("ConversionDecode", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Select which conversion mode you want to use.- /// </summary>- internal static string ConversionDescription {- get {- return ResourceManager.GetString("ConversionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Encode.- /// </summary>- internal static string ConversionEncode {- get {- return ResourceManager.GetString("ConversionEncode", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Whether to encode or decode text in a URL parameter.- /// </summary>- internal static string ConversionOptionDescription {- get {- return ResourceManager.GetString("ConversionOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Conversion.- /// </summary>- internal static string ConversionTitle {- get {- return ResourceManager.GetString("ConversionTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Encode or decode all the applicable characters to their corresponding URL entities.- /// </summary>- internal static string Description {- get {- return ResourceManager.GetString("Description", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Text to encode or URL to decode.- /// </summary>- internal static string InputOptionDescription {- get {- return ResourceManager.GetString("InputOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Input.- /// </summary>- internal static string InputTitle {- get {- return ResourceManager.GetString("InputTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to URL Encoder / Decoder.- /// </summary>- internal static string LongDisplayTitle {- get {- return ResourceManager.GetString("LongDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Output.- /// </summary>- internal static string OutputTitle {- get {- return ResourceManager.GetString("OutputTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to URL.- /// </summary>- internal static string ShortDisplayTitle {- get {- return ResourceManager.GetString("ShortDisplayTitle", resourceCulture);- }- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Url/UrlEncoderDecoder.resx b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Url/UrlEncoderDecoder.resxdeleted file mode 100644index 3b9eb07e6..000000000--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Url/UrlEncoderDecoder.resx+++ /dev/null@@ -1,159 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<root>- <!--- Microsoft ResX Schema-- Version 2.0-- The primary goals of this format is to allow a simple XML format- that is mostly human readable. The generation and parsing of the- various data types are done through the TypeConverter classes- associated with the data types.-- Example:-- ... ado.net/XML headers & schema ...- <resheader name="resmimetype">text/microsoft-resx</resheader>- <resheader name="version">2.0</resheader>- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">- <value>[base64 mime encoded serialized .NET Framework object]</value>- </data>- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>- <comment>This is a comment</comment>- </data>-- There are any number of "resheader" rows that contain simple- name/value pairs.-- Each data row contains a name, and value. The row also contains a- type or mimetype. Type corresponds to a .NET class that support- text/value conversion through the TypeConverter architecture.- Classes that don't support this are serialized and stored with the- mimetype set.-- The mimetype is used for serialized objects, and tells the- ResXResourceReader how to depersist the object. This is currently not- extensible. For a given mimetype the value must be set accordingly:-- Note - application/x-microsoft.net.object.binary.base64 is the format- that the ResXResourceWriter will generate, however the reader can- read any of the formats listed below.-- mimetype: application/x-microsoft.net.object.binary.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.soap.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.bytearray.base64- value : The object must be serialized into a byte array- : using a System.ComponentModel.TypeConverter- : and then encoded with base64 encoding.- -->- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />- <xsd:element name="root" msdata:IsDataSet="true">- <xsd:complexType>- <xsd:choice maxOccurs="unbounded">- <xsd:element name="metadata">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" />- </xsd:sequence>- <xsd:attribute name="name" use="required" type="xsd:string" />- <xsd:attribute name="type" type="xsd:string" />- <xsd:attribute name="mimetype" type="xsd:string" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="assembly">- <xsd:complexType>- <xsd:attribute name="alias" type="xsd:string" />- <xsd:attribute name="name" type="xsd:string" />- </xsd:complexType>- </xsd:element>- <xsd:element name="data">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="resheader">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" />- </xsd:complexType>- </xsd:element>- </xsd:choice>- </xsd:complexType>- </xsd:element>- </xsd:schema>- <resheader name="resmimetype">- <value>text/microsoft-resx</value>- </resheader>- <resheader name="version">- <value>2.0</value>- </resheader>- <resheader name="reader">- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <resheader name="writer">- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <data name="AccessibleName" xml:space="preserve">- <value>URL Encoder and Decoder tool</value>- </data>- <data name="ConfigurationTitle" xml:space="preserve">- <value>Configuration</value>- </data>- <data name="ConversionDecode" xml:space="preserve">- <value>Decode</value>- </data>- <data name="ConversionDescription" xml:space="preserve">- <value>Select which conversion mode you want to use</value>- </data>- <data name="ConversionEncode" xml:space="preserve">- <value>Encode</value>- </data>- <data name="ConversionOptionDescription" xml:space="preserve">- <value>Whether to encode or decode text in a URL parameter</value>- </data>- <data name="ConversionTitle" xml:space="preserve">- <value>Conversion</value>- </data>- <data name="Description" xml:space="preserve">- <value>Encode or decode all the applicable characters to their corresponding URL entities</value>- </data>- <data name="InputOptionDescription" xml:space="preserve">- <value>Text to encode or URL to decode</value>- </data>- <data name="InputTitle" xml:space="preserve">- <value>Input</value>- </data>- <data name="LongDisplayTitle" xml:space="preserve">- <value>URL Encoder / Decoder</value>- </data>- <data name="OutputTitle" xml:space="preserve">- <value>Output</value>- </data>- <data name="ShortDisplayTitle" xml:space="preserve">- <value>URL</value>- </data>-</root>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Url/UrlEncoderDecoderCommandLineTool.cs b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Url/UrlEncoderDecoderCommandLineTool.csdeleted file mode 100644index 55e07b030..000000000--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Url/UrlEncoderDecoderCommandLineTool.cs+++ /dev/null@@ -1,39 +0,0 @@-using DevToys.Tools.Helpers;-using DevToys.Tools.Models;-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.Tools.EncodersDecoders.Url;--[Export(typeof(ICommandLineTool))]-[Name("UrlEncoderDecoder")]-[CommandName(- Name = "url",- ResourceManagerBaseName = "DevToys.Tools.Tools.EncodersDecoders.Url.UrlEncoderDecoder",- DescriptionResourceName = nameof(UrlEncoderDecoder.Description))]-internal sealed class UrlEncoderDecoderCommandLineTool : ICommandLineTool-{- [CommandLineOption(- Name = "input",- Alias = "i",- IsRequired = true,- DescriptionResourceName = nameof(UrlEncoderDecoder.InputOptionDescription))]- private string? Input { get; set; }-- [CommandLineOption(- Name = "conversion",- Alias = "c",- DescriptionResourceName = nameof(UrlEncoderDecoder.ConversionOptionDescription))]- private EncodingConversion EncodingConversionMode { get; set; } = EncodingConversion.Encode;-- public ValueTask<int> InvokeAsync(ILogger logger, CancellationToken cancellationToken)- {- Console.WriteLine(- UrlHelper.EncodeOrDecode(- Input,- EncodingConversionMode,- logger,- cancellationToken));-- return new ValueTask<int>(0);- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Url/UrlEncoderDecoderGuiTool.cs b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Url/UrlEncoderDecoderGuiTool.csdeleted file mode 100644index a2ebe2a05..000000000--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Url/UrlEncoderDecoderGuiTool.cs+++ /dev/null@@ -1,178 +0,0 @@-using DevToys.Tools.Helpers;-using DevToys.Tools.Models;-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.Tools.EncodersDecoders.Url;--[Export(typeof(IGuiTool))]-[Name("UrlEncoderDecoder")]-[ToolDisplayInformation(- IconFontName = "DevToys-Tools-Icons",- IconGlyph = '\u0121',- GroupName = PredefinedCommonToolGroupNames.EncodersDecoders,- ResourceManagerAssemblyIdentifier = nameof(DevToysToolsResourceManagerAssemblyIdentifier),- ResourceManagerBaseName = "DevToys.Tools.Tools.EncodersDecoders.Url.UrlEncoderDecoder",- ShortDisplayTitleResourceName = nameof(UrlEncoderDecoder.ShortDisplayTitle),- LongDisplayTitleResourceName = nameof(UrlEncoderDecoder.LongDisplayTitle),- DescriptionResourceName = nameof(UrlEncoderDecoder.Description),- AccessibleNameResourceName = nameof(UrlEncoderDecoder.AccessibleName))]-internal sealed partial class UrlEncoderDecoderGuiTool : IGuiTool, IDisposable-{- /// <summary>- /// Whether the tool should encode or decode Url.- /// </summary>- private static readonly SettingDefinition<EncodingConversion> conversionMode- = new(- name: $"{nameof(UrlEncoderDecoderGuiTool)}.{nameof(conversionMode)}",- defaultValue: EncodingConversion.Encode);-- private enum GridRows- {- Settings,- Input,- Output- }-- private enum GridColumns- {- Stretch- }-- private readonly DisposableSemaphore _semaphore = new();- private readonly ILogger _logger;- private readonly ISettingsProvider _settingsProvider;- private readonly IUISwitch _conversionModeSwitch = Switch("url-conversion-mode-switch");- private readonly IUIMultiLineTextInput _inputText = MultilineTextInput("url-input-box");- private readonly IUIMultiLineTextInput _outputText = MultilineTextInput("url-output-box");-- private CancellationTokenSource? _cancellationTokenSource;-- [ImportingConstructor]- public UrlEncoderDecoderGuiTool(ISettingsProvider settingsProvider)- {- _logger = this.Log();- _settingsProvider = settingsProvider;-- switch (_settingsProvider.GetSetting(conversionMode))- {- case EncodingConversion.Encode:- _conversionModeSwitch.On();- _inputText.AutoWrap();- _outputText.AlwaysWrap();- break;-- case EncodingConversion.Decode:- _inputText.AlwaysWrap();- _outputText.AutoWrap();- break;-- default:- throw new NotSupportedException();- }- }-- // For unit tests.- internal Task? WorkTask { get; private set; }-- public UIToolView View- => new(- isScrollable: true,- Grid()- .RowLargeSpacing()-- .Rows(- (GridRows.Settings, Auto),- (GridRows.Input, new UIGridLength(1, UIGridUnitType.Fraction)),- (GridRows.Output, new UIGridLength(1, UIGridUnitType.Fraction)))-- .Columns(- (GridColumns.Stretch, new UIGridLength(1, UIGridUnitType.Fraction)))-- .Cells(- Cell(- GridRows.Settings,- GridColumns.Stretch,-- Stack()- .Vertical()- .SmallSpacing()-- .WithChildren(- Label()- .Text(UrlEncoderDecoder.ConfigurationTitle),-- Setting("url-conversion-mode-setting")- .Icon("FluentSystemIcons", '\uF18D')- .Title(UrlEncoderDecoder.ConversionTitle)- .Description(UrlEncoderDecoder.ConversionDescription)-- .InteractiveElement(- _conversionModeSwitch- .OnText(UrlEncoderDecoder.ConversionEncode)- .OffText(UrlEncoderDecoder.ConversionDecode)- .OnToggle(OnConversionModeChanged)))),-- Cell(- GridRows.Input,- GridColumns.Stretch,-- _inputText- .Title(UrlEncoderDecoder.InputTitle)- .OnTextChanged(OnInputTextChanged)),-- Cell(- GridRows.Output,- GridColumns.Stretch,-- _outputText- .Title(UrlEncoderDecoder.OutputTitle)- .ReadOnly()- .Extendable())));-- public void OnDataReceived(string dataTypeName, object? parsedData)- {- throw new NotImplementedException();- }-- public void Dispose()- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _semaphore.Dispose();- }-- private void OnConversionModeChanged(bool conversionMode)- {- _settingsProvider.SetSetting(UrlEncoderDecoderGuiTool.conversionMode, conversionMode ? EncodingConversion.Encode : EncodingConversion.Decode);- _inputText.Text(_outputText.Text); // This will trigger a conversion.- }-- private void OnInputTextChanged(string text)- {- StartConvert(text);- }-- private void StartConvert(string text)- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _cancellationTokenSource = new CancellationTokenSource();-- WorkTask = ConvertAsync(text, _settingsProvider.GetSetting(conversionMode), _cancellationTokenSource.Token);- }-- private async Task ConvertAsync(string input, EncodingConversion conversionModeSetting, CancellationToken cancellationToken)- {- using (await _semaphore.WaitAsync(cancellationToken))- {- await TaskSchedulerAwaiter.SwitchOffMainThreadAsync(cancellationToken);-- _outputText.Text(- UrlHelper.EncodeOrDecode(- input,- conversionModeSetting,- _logger,- cancellationToken));- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Formatters/Formatters.Designer.cs b/src/app/dev/DevToys.Tools/Tools/Formatters/Formatters.Designer.csdeleted file mode 100644index e8b90d66b..000000000--- a/src/app/dev/DevToys.Tools/Tools/Formatters/Formatters.Designer.cs+++ /dev/null@@ -1,81 +0,0 @@-//-------------------------------------------------------------------------------// <auto-generated>-// This code was generated by a tool.-// Runtime Version:4.0.30319.42000-//-// Changes to this file may cause incorrect behavior and will be lost if-// the code is regenerated.-// </auto-generated>-//--------------------------------------------------------------------------------namespace DevToys.Tools.Tools.Formatters {- using System;--- /// <summary>- /// A strongly-typed resource class, for looking up localized strings, etc.- /// </summary>- // This class was auto-generated by the StronglyTypedResourceBuilder- // class via a tool like ResGen or Visual Studio.- // To add or remove a member, edit your .ResX file then rerun ResGen- // with the /str option, or rebuild your VS project.- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]- internal class Formatters {-- private static global::System.Resources.ResourceManager resourceMan;-- private static global::System.Globalization.CultureInfo resourceCulture;-- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]- internal Formatters() {- }-- /// <summary>- /// Returns the cached ResourceManager instance used by this class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Resources.ResourceManager ResourceManager {- get {- if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Tools.Tools.Formatters.Formatters", typeof(Formatters).Assembly);- resourceMan = temp;- }- return resourceMan;- }- }-- /// <summary>- /// Overrides the current thread's CurrentUICulture property for all- /// resource lookups using this strongly typed resource class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Globalization.CultureInfo Culture {- get {- return resourceCulture;- }- set {- resourceCulture = value;- }- }-- /// <summary>- /// Looks up a localized string similar to Formatters.- /// </summary>- internal static string AccessibleName {- get {- return ResourceManager.GetString("AccessibleName", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Formatters.- /// </summary>- internal static string DisplayTitle {- get {- return ResourceManager.GetString("DisplayTitle", resourceCulture);- }- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Formatters/Formatters.resx b/src/app/dev/DevToys.Tools/Tools/Formatters/Formatters.resxdeleted file mode 100644index dbce062fd..000000000--- a/src/app/dev/DevToys.Tools/Tools/Formatters/Formatters.resx+++ /dev/null@@ -1,126 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<root>- <!--- Microsoft ResX Schema-- Version 2.0-- The primary goals of this format is to allow a simple XML format- that is mostly human readable. The generation and parsing of the- various data types are done through the TypeConverter classes- associated with the data types.-- Example:-- ... ado.net/XML headers & schema ...- <resheader name="resmimetype">text/microsoft-resx</resheader>- <resheader name="version">2.0</resheader>- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">- <value>[base64 mime encoded serialized .NET Framework object]</value>- </data>- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>- <comment>This is a comment</comment>- </data>-- There are any number of "resheader" rows that contain simple- name/value pairs.-- Each data row contains a name, and value. The row also contains a- type or mimetype. Type corresponds to a .NET class that support- text/value conversion through the TypeConverter architecture.- Classes that don't support this are serialized and stored with the- mimetype set.-- The mimetype is used for serialized objects, and tells the- ResXResourceReader how to depersist the object. This is currently not- extensible. For a given mimetype the value must be set accordingly:-- Note - application/x-microsoft.net.object.binary.base64 is the format- that the ResXResourceWriter will generate, however the reader can- read any of the formats listed below.-- mimetype: application/x-microsoft.net.object.binary.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.soap.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.bytearray.base64- value : The object must be serialized into a byte array- : using a System.ComponentModel.TypeConverter- : and then encoded with base64 encoding.- -->- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />- <xsd:element name="root" msdata:IsDataSet="true">- <xsd:complexType>- <xsd:choice maxOccurs="unbounded">- <xsd:element name="metadata">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" />- </xsd:sequence>- <xsd:attribute name="name" use="required" type="xsd:string" />- <xsd:attribute name="type" type="xsd:string" />- <xsd:attribute name="mimetype" type="xsd:string" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="assembly">- <xsd:complexType>- <xsd:attribute name="alias" type="xsd:string" />- <xsd:attribute name="name" type="xsd:string" />- </xsd:complexType>- </xsd:element>- <xsd:element name="data">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="resheader">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" />- </xsd:complexType>- </xsd:element>- </xsd:choice>- </xsd:complexType>- </xsd:element>- </xsd:schema>- <resheader name="resmimetype">- <value>text/microsoft-resx</value>- </resheader>- <resheader name="version">- <value>2.0</value>- </resheader>- <resheader name="reader">- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <resheader name="writer">- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <data name="AccessibleName" xml:space="preserve">- <value>Formatters</value>- </data>- <data name="DisplayTitle" xml:space="preserve">- <value>Formatters</value>- </data>-</root>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/Formatters/Json/JsonFormatter.Designer.cs b/src/app/dev/DevToys.Tools/Tools/Formatters/Json/JsonFormatter.Designer.csdeleted file mode 100644index 6c0e3010f..000000000--- a/src/app/dev/DevToys.Tools/Tools/Formatters/Json/JsonFormatter.Designer.cs+++ /dev/null@@ -1,243 +0,0 @@-//-------------------------------------------------------------------------------// <auto-generated>-// This code was generated by a tool.-// Runtime Version:4.0.30319.42000-//-// Changes to this file may cause incorrect behavior and will be lost if-// the code is regenerated.-// </auto-generated>-//--------------------------------------------------------------------------------namespace DevToys.Tools.Tools.Formatters.Json {- using System;--- /// <summary>- /// A strongly-typed resource class, for looking up localized strings, etc.- /// </summary>- // This class was auto-generated by the StronglyTypedResourceBuilder- // class via a tool like ResGen or Visual Studio.- // To add or remove a member, edit your .ResX file then rerun ResGen- // with the /str option, or rebuild your VS project.- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]- internal class JsonFormatter {-- private static global::System.Resources.ResourceManager resourceMan;-- private static global::System.Globalization.CultureInfo resourceCulture;-- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]- internal JsonFormatter() {- }-- /// <summary>- /// Returns the cached ResourceManager instance used by this class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Resources.ResourceManager ResourceManager {- get {- if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Tools.Tools.Formatters.Json.JsonFormatter", typeof(JsonFormatter).Assembly);- resourceMan = temp;- }- return resourceMan;- }- }-- /// <summary>- /// Overrides the current thread's CurrentUICulture property for all- /// resource lookups using this strongly typed resource class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Globalization.CultureInfo Culture {- get {- return resourceCulture;- }- set {- resourceCulture = value;- }- }-- /// <summary>- /// Looks up a localized string similar to JSON Formatter tool.- /// </summary>- internal static string AccessibleName {- get {- return ResourceManager.GetString("AccessibleName", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Configuration.- /// </summary>- internal static string Configuration {- get {- return ResourceManager.GetString("Configuration", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Indent or minify JSON data.- /// </summary>- internal static string Description {- get {- return ResourceManager.GetString("Description", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to 4 spaces.- /// </summary>- internal static string FourSpaces {- get {- return ResourceManager.GetString("FourSpaces", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Indentation.- /// </summary>- internal static string Indentation {- get {- return ResourceManager.GetString("Indentation", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Select which indentation you want to use.- /// </summary>- internal static string IndentationOptionDescription {- get {- return ResourceManager.GetString("IndentationOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Input.- /// </summary>- internal static string Input {- get {- return ResourceManager.GetString("Input", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Input file selected doesn't exist..- /// </summary>- internal static string InputFileNotFound {- get {- return ResourceManager.GetString("InputFileNotFound", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Text or path to a file containing the JSON to format.- /// </summary>- internal static string InputOptionDescription {- get {- return ResourceManager.GetString("InputOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Please specify an input text or an input file.- /// </summary>- internal static string InvalidInputOrFileCommand {- get {- return ResourceManager.GetString("InvalidInputOrFileCommand", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to JSON Formatter.- /// </summary>- internal static string LongDisplayTitle {- get {- return ResourceManager.GetString("LongDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Minified.- /// </summary>- internal static string Minified {- get {- return ResourceManager.GetString("Minified", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to 1 tab.- /// </summary>- internal static string OneTab {- get {- return ResourceManager.GetString("OneTab", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Output.- /// </summary>- internal static string Output {- get {- return ResourceManager.GetString("Output", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Path to the output file.- /// </summary>- internal static string OutputFileOptionDescription {- get {- return ResourceManager.GetString("OutputFileOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to sort order alphabetize.- /// </summary>- internal static string SearchKeywords {- get {- return ResourceManager.GetString("SearchKeywords", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to JSON.- /// </summary>- internal static string ShortDisplayTitle {- get {- return ResourceManager.GetString("ShortDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Sort JSON Properties alphabetically.- /// </summary>- internal static string SortProperties {- get {- return ResourceManager.GetString("SortProperties", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Whether properties within the JSON should be sorted alphabetically.- /// </summary>- internal static string SortPropertiesOptionDescription {- get {- return ResourceManager.GetString("SortPropertiesOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to 2 spaces.- /// </summary>- internal static string TwoSpaces {- get {- return ResourceManager.GetString("TwoSpaces", resourceCulture);- }- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Formatters/Json/JsonFormatter.resx b/src/app/dev/DevToys.Tools/Tools/Formatters/Json/JsonFormatter.resxdeleted file mode 100644index ce1af9324..000000000--- a/src/app/dev/DevToys.Tools/Tools/Formatters/Json/JsonFormatter.resx+++ /dev/null@@ -1,180 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<root>- <!--- Microsoft ResX Schema-- Version 2.0-- The primary goals of this format is to allow a simple XML format- that is mostly human readable. The generation and parsing of the- various data types are done through the TypeConverter classes- associated with the data types.-- Example:-- ... ado.net/XML headers & schema ...- <resheader name="resmimetype">text/microsoft-resx</resheader>- <resheader name="version">2.0</resheader>- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">- <value>[base64 mime encoded serialized .NET Framework object]</value>- </data>- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>- <comment>This is a comment</comment>- </data>-- There are any number of "resheader" rows that contain simple- name/value pairs.-- Each data row contains a name, and value. The row also contains a- type or mimetype. Type corresponds to a .NET class that support- text/value conversion through the TypeConverter architecture.- Classes that don't support this are serialized and stored with the- mimetype set.-- The mimetype is used for serialized objects, and tells the- ResXResourceReader how to depersist the object. This is currently not- extensible. For a given mimetype the value must be set accordingly:-- Note - application/x-microsoft.net.object.binary.base64 is the format- that the ResXResourceWriter will generate, however the reader can- read any of the formats listed below.-- mimetype: application/x-microsoft.net.object.binary.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.soap.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.bytearray.base64- value : The object must be serialized into a byte array- : using a System.ComponentModel.TypeConverter- : and then encoded with base64 encoding.- -->- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />- <xsd:element name="root" msdata:IsDataSet="true">- <xsd:complexType>- <xsd:choice maxOccurs="unbounded">- <xsd:element name="metadata">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" />- </xsd:sequence>- <xsd:attribute name="name" use="required" type="xsd:string" />- <xsd:attribute name="type" type="xsd:string" />- <xsd:attribute name="mimetype" type="xsd:string" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="assembly">- <xsd:complexType>- <xsd:attribute name="alias" type="xsd:string" />- <xsd:attribute name="name" type="xsd:string" />- </xsd:complexType>- </xsd:element>- <xsd:element name="data">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="resheader">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" />- </xsd:complexType>- </xsd:element>- </xsd:choice>- </xsd:complexType>- </xsd:element>- </xsd:schema>- <resheader name="resmimetype">- <value>text/microsoft-resx</value>- </resheader>- <resheader name="version">- <value>2.0</value>- </resheader>- <resheader name="reader">- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <resheader name="writer">- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <data name="AccessibleName" xml:space="preserve">- <value>JSON Formatter tool</value>- </data>- <data name="Configuration" xml:space="preserve">- <value>Configuration</value>- </data>- <data name="Description" xml:space="preserve">- <value>Indent or minify JSON data</value>- </data>- <data name="FourSpaces" xml:space="preserve">- <value>4 spaces</value>- </data>- <data name="Indentation" xml:space="preserve">- <value>Indentation</value>- </data>- <data name="IndentationOptionDescription" xml:space="preserve">- <value>Select which indentation you want to use</value>- </data>- <data name="Input" xml:space="preserve">- <value>Input</value>- </data>- <data name="InputFileNotFound" xml:space="preserve">- <value>Input file selected doesn't exist.</value>- </data>- <data name="InputOptionDescription" xml:space="preserve">- <value>Text or path to a file containing the JSON to format</value>- </data>- <data name="InvalidInputOrFileCommand" xml:space="preserve">- <value>Please specify an input text or an input file</value>- </data>- <data name="LongDisplayTitle" xml:space="preserve">- <value>JSON Formatter</value>- </data>- <data name="Minified" xml:space="preserve">- <value>Minified</value>- </data>- <data name="OneTab" xml:space="preserve">- <value>1 tab</value>- </data>- <data name="Output" xml:space="preserve">- <value>Output</value>- </data>- <data name="OutputFileOptionDescription" xml:space="preserve">- <value>Path to the output file</value>- </data>- <data name="SearchKeywords" xml:space="preserve">- <value>sort order alphabetize</value>- </data>- <data name="ShortDisplayTitle" xml:space="preserve">- <value>JSON</value>- </data>- <data name="SortProperties" xml:space="preserve">- <value>Sort JSON Properties alphabetically</value>- </data>- <data name="SortPropertiesOptionDescription" xml:space="preserve">- <value>Whether properties within the JSON should be sorted alphabetically</value>- </data>- <data name="TwoSpaces" xml:space="preserve">- <value>2 spaces</value>- </data>-</root>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/Formatters/Json/JsonFormatterCommandLineTool.cs b/src/app/dev/DevToys.Tools/Tools/Formatters/Json/JsonFormatterCommandLineTool.csdeleted file mode 100644index c4fc415b1..000000000--- a/src/app/dev/DevToys.Tools/Tools/Formatters/Json/JsonFormatterCommandLineTool.cs+++ /dev/null@@ -1,79 +0,0 @@-using DevToys.Tools.Helpers;-using DevToys.Tools.Models;-using Microsoft.Extensions.Logging;-using OneOf;--namespace DevToys.Tools.Tools.Formatters.Json;--[Export(typeof(ICommandLineTool))]-[Name("JsonFormatter")]-[CommandName(- Name = "JsonFormatter",- Alias = "Jsonf",- ResourceManagerBaseName = "DevToys.Tools.Tools.Formatters.Json.JsonFormatter",- DescriptionResourceName = nameof(JsonFormatter.Description))]-internal sealed class JsonFormatterCommandLineTool : ICommandLineTool-{-#pragma warning disable IDE0044 // Add readonly modifier- [Import]- private IFileStorage _fileStorage = null!;-#pragma warning restore IDE0044 // Add readonly modifier-- [CommandLineOption(- Name = "input",- Alias = "i",- IsRequired = true,- DescriptionResourceName = nameof(JsonFormatter.InputOptionDescription))]- internal OneOf<FileInfo, string>? Input { get; set; }-- [CommandLineOption(- Name = "outputFile",- Alias = "o",- DescriptionResourceName = nameof(JsonFormatter.OutputFileOptionDescription))]- internal FileInfo? OutputFile { get; set; }-- [CommandLineOption(- Name = "indentation",- DescriptionResourceName = nameof(JsonFormatter.IndentationOptionDescription))]- internal Indentation IndentationMode { get; set; } = Indentation.TwoSpaces;-- [CommandLineOption(- Name = "sortProperties",- DescriptionResourceName = nameof(JsonFormatter.SortPropertiesOptionDescription))]- internal bool SortProperties { get; set; } = false;-- public async ValueTask<int> InvokeAsync(ILogger logger, CancellationToken cancellationToken)- {- if (!Input.HasValue)- {- Console.Error.WriteLine(JsonFormatter.InvalidInputOrFileCommand);- return -1;- }-- ResultInfo<string> input = await Input.Value.ReadAllTextAsync(_fileStorage, cancellationToken);- if (!input.HasSucceeded)- {- Console.Error.WriteLine(JsonFormatter.InputFileNotFound);- return -1;- }-- Guard.IsNotNull(input.Data);- ResultInfo<string> formatResult = await JsonHelper.FormatAsync(- input.Data,- IndentationMode,- SortProperties,- logger,- cancellationToken);-- cancellationToken.ThrowIfCancellationRequested();-- if (!formatResult.HasSucceeded)- {- Console.Error.WriteLine(formatResult.Data);- return -1;- }-- await FileHelper.WriteOutputAsync(formatResult.Data, OutputFile, cancellationToken);- return 0;- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Formatters/Json/JsonFormatterGuiTool.cs b/src/app/dev/DevToys.Tools/Tools/Formatters/Json/JsonFormatterGuiTool.csdeleted file mode 100644index 3f5138ff1..000000000--- a/src/app/dev/DevToys.Tools/Tools/Formatters/Json/JsonFormatterGuiTool.cs+++ /dev/null@@ -1,182 +0,0 @@-using DevToys.Tools.Helpers;-using DevToys.Tools.Models;-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.Tools.Formatters.Json;--[Export(typeof(IGuiTool))]-[Name("JsonFormatter")]-[ToolDisplayInformation(- IconFontName = "DevToys-Tools-Icons",- IconGlyph = '\u0108',- GroupName = PredefinedCommonToolGroupNames.Formatters,- ResourceManagerAssemblyIdentifier = nameof(DevToysToolsResourceManagerAssemblyIdentifier),- ResourceManagerBaseName = "DevToys.Tools.Tools.Formatters.Json.JsonFormatter",- ShortDisplayTitleResourceName = nameof(JsonFormatter.ShortDisplayTitle),- LongDisplayTitleResourceName = nameof(JsonFormatter.LongDisplayTitle),- DescriptionResourceName = nameof(JsonFormatter.Description),- SearchKeywordsResourceName = nameof(JsonFormatter.SearchKeywords),- AccessibleNameResourceName = nameof(JsonFormatter.AccessibleName))]-[AcceptedDataTypeName(PredefinedCommonDataTypeNames.Json)]-internal sealed partial class JsonFormatterGuiTool : IGuiTool, IDisposable-{- /// <summary>- /// Which indentation the tool need to use.- /// </summary>- private static readonly SettingDefinition<Indentation> indentationMode- = new(name: $"{nameof(JsonFormatterGuiTool)}.{nameof(indentationMode)}", defaultValue: Indentation.TwoSpaces);-- /// <summary>- /// Whether properties within the JSON should be sorted alphabetically- /// </summary>- private static readonly SettingDefinition<bool> sortProperties- = new(name: $"{nameof(JsonFormatterGuiTool)}.{nameof(sortProperties)}", defaultValue: false);-- private enum GridColumn- {- Content- }-- private enum GridRow- {- Header,- Content,- Footer- }-- private readonly DisposableSemaphore _semaphore = new();- private readonly ILogger _logger;- private readonly ISettingsProvider _settingsProvider;- private readonly IUIMultiLineTextInput _inputTextArea = MultilineTextInput("json-input-text-area");- private readonly IUIMultiLineTextInput _outputTextArea = MultilineTextInput("json-output-text-area");-- private CancellationTokenSource? _cancellationTokenSource;-- [ImportingConstructor]- public JsonFormatterGuiTool(ISettingsProvider settingsProvider)- {- _logger = this.Log();- _settingsProvider = settingsProvider;- }-- internal Task? WorkTask { get; private set; }-- public UIToolView View- => new(- isScrollable: true,- Grid()- .ColumnLargeSpacing()- .RowLargeSpacing()- .Rows(- (GridRow.Header, Auto),- (GridRow.Content, new UIGridLength(1, UIGridUnitType.Fraction))- )- .Columns(- (GridColumn.Content, new UIGridLength(1, UIGridUnitType.Fraction))- )- .Cells(- Cell(- GridRow.Header,- GridColumn.Content,- Stack().Vertical().WithChildren(- Label().Text(JsonFormatter.Configuration),- Setting("json-text-indentation-setting")- .Icon("FluentSystemIcons", '\uF6F8')- .Title(JsonFormatter.Indentation)- .Handle(- _settingsProvider,- indentationMode,- OnIndentationModelChanged,- Item(JsonFormatter.TwoSpaces, Indentation.TwoSpaces),- Item(JsonFormatter.FourSpaces, Indentation.FourSpaces),- Item(JsonFormatter.OneTab, Indentation.OneTab),- Item(JsonFormatter.Minified, Indentation.Minified)- ),- Setting("json-text-sortProperties-setting")- .Icon("FluentSystemIcons", '\uf802')- .Title(JsonFormatter.SortProperties)- .Handle(- _settingsProvider,- sortProperties,- OnSettingChanged- )- )- ),- Cell(- GridRow.Content,- GridColumn.Content,- SplitGrid()- .Vertical()- .WithLeftPaneChild(- _inputTextArea- .Title(JsonFormatter.Input)- .Language("json")- .OnTextChanged(OnInputTextChanged))- .WithRightPaneChild(- _outputTextArea- .Title(JsonFormatter.Output)- .Language("json")- .ReadOnly()- .Extendable())- )- )- );-- // Smart detection handler.- public void OnDataReceived(string dataTypeName, object? parsedData)- {- if (dataTypeName == PredefinedCommonDataTypeNames.Json &&- parsedData is string jsonStrongTypedParsedData)- {- _inputTextArea.Text(jsonStrongTypedParsedData);- }- }-- public void Dispose()- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _semaphore.Dispose();- }-- private void OnSettingChanged(bool value)- {- StartFormat(_inputTextArea.Text);- }-- private void OnIndentationModelChanged(Indentation indentationMode)- {- StartFormat(_inputTextArea.Text);- }-- private void OnInputTextChanged(string text)- {- StartFormat(text);- }-- private void StartFormat(string text)- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _cancellationTokenSource = new CancellationTokenSource();-- WorkTask = FormatAsync(text, _settingsProvider.GetSetting(indentationMode), _settingsProvider.GetSetting(sortProperties), _cancellationTokenSource.Token);- }-- private async Task FormatAsync(string input, Indentation indentationSetting, bool sortPropertiesSetting, CancellationToken cancellationToken)- {- using (await _semaphore.WaitAsync(cancellationToken))- {- await TaskSchedulerAwaiter.SwitchOffMainThreadAsync(cancellationToken);-- ResultInfo<string> formatResult = await JsonHelper.FormatAsync(- input,- indentationSetting,- sortPropertiesSetting,- _logger,- cancellationToken);-- _outputTextArea.Text(formatResult.Data!);- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Formatters/Sql/SqlFormatter.Designer.cs b/src/app/dev/DevToys.Tools/Tools/Formatters/Sql/SqlFormatter.Designer.csdeleted file mode 100644index e66ec1300..000000000--- a/src/app/dev/DevToys.Tools/Tools/Formatters/Sql/SqlFormatter.Designer.cs+++ /dev/null@@ -1,342 +0,0 @@-//-------------------------------------------------------------------------------// <auto-generated>-// This code was generated by a tool.-// Runtime Version:4.0.30319.42000-//-// Changes to this file may cause incorrect behavior and will be lost if-// the code is regenerated.-// </auto-generated>-//--------------------------------------------------------------------------------namespace DevToys.Tools.Tools.Formatters.Sql {- using System;--- /// <summary>- /// A strongly-typed resource class, for looking up localized strings, etc.- /// </summary>- // This class was auto-generated by the StronglyTypedResourceBuilder- // class via a tool like ResGen or Visual Studio.- // To add or remove a member, edit your .ResX file then rerun ResGen- // with the /str option, or rebuild your VS project.- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]- internal class SqlFormatter {-- private static global::System.Resources.ResourceManager resourceMan;-- private static global::System.Globalization.CultureInfo resourceCulture;-- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]- internal SqlFormatter() {- }-- /// <summary>- /// Returns the cached ResourceManager instance used by this class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Resources.ResourceManager ResourceManager {- get {- if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Tools.Tools.Formatters.Sql.SqlFormatter", typeof(SqlFormatter).Assembly);- resourceMan = temp;- }- return resourceMan;- }- }-- /// <summary>- /// Overrides the current thread's CurrentUICulture property for all- /// resource lookups using this strongly typed resource class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Globalization.CultureInfo Culture {- get {- return resourceCulture;- }- set {- resourceCulture = value;- }- }-- /// <summary>- /// Looks up a localized string similar to SQL Formatter tool.- /// </summary>- internal static string AccessibleName {- get {- return ResourceManager.GetString("AccessibleName", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Configuration.- /// </summary>- internal static string Configuration {- get {- return ResourceManager.GetString("Configuration", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Db2.- /// </summary>- internal static string Db2 {- get {- return ResourceManager.GetString("Db2", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Format SQL data.- /// </summary>- internal static string Description {- get {- return ResourceManager.GetString("Description", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to 4 spaces.- /// </summary>- internal static string FourSpaces {- get {- return ResourceManager.GetString("FourSpaces", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Indentation.- /// </summary>- internal static string Indentation {- get {- return ResourceManager.GetString("Indentation", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Select which indentation you want to use.- /// </summary>- internal static string IndentationOptionDescription {- get {- return ResourceManager.GetString("IndentationOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Input.- /// </summary>- internal static string Input {- get {- return ResourceManager.GetString("Input", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Input file selected doesn't exist..- /// </summary>- internal static string InputFileNotFound {- get {- return ResourceManager.GetString("InputFileNotFound", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Text or path to a file containing the sql to format.- /// </summary>- internal static string InputOptionDescription {- get {- return ResourceManager.GetString("InputOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Please specify an input text or an input file.- /// </summary>- internal static string InvalidInputOrFileCommand {- get {- return ResourceManager.GetString("InvalidInputOrFileCommand", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Leading comma.- /// </summary>- internal static string LeadingComma {- get {- return ResourceManager.GetString("LeadingComma", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Whether to use leading commas or not.- /// </summary>- internal static string LeadingCommaDescription {- get {- return ResourceManager.GetString("LeadingCommaDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to SQL Formatter.- /// </summary>- internal static string LongDisplayTitle {- get {- return ResourceManager.GetString("LongDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to MariaDB.- /// </summary>- internal static string MariaDb {- get {- return ResourceManager.GetString("MariaDb", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to MySQL.- /// </summary>- internal static string MySql {- get {- return ResourceManager.GetString("MySql", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to N1QL.- /// </summary>- internal static string N1ql {- get {- return ResourceManager.GetString("N1ql", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to 1 tab.- /// </summary>- internal static string OneTab {- get {- return ResourceManager.GetString("OneTab", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Output.- /// </summary>- internal static string Output {- get {- return ResourceManager.GetString("Output", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Path to the output file.- /// </summary>- internal static string OutputFileOptionDescription {- get {- return ResourceManager.GetString("OutputFileOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to PL/SQL.- /// </summary>- internal static string PlSql {- get {- return ResourceManager.GetString("PlSql", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to PostgreSQL.- /// </summary>- internal static string PostgreSql {- get {- return ResourceManager.GetString("PostgreSql", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Amazon Redshift.- /// </summary>- internal static string RedShift {- get {- return ResourceManager.GetString("RedShift", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to SQL Formatter.- /// </summary>- internal static string SearchDisplayName {- get {- return ResourceManager.GetString("SearchDisplayName", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to SQL.- /// </summary>- internal static string ShortDisplayTitle {- get {- return ResourceManager.GetString("ShortDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Spark SQL.- /// </summary>- internal static string SparkSql {- get {- return ResourceManager.GetString("SparkSql", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Language.- /// </summary>- internal static string SqlLanguage {- get {- return ResourceManager.GetString("SqlLanguage", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Which SQL language to use.- /// </summary>- internal static string SqlLanguageDescription {- get {- return ResourceManager.GetString("SqlLanguageDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Standard SQL.- /// </summary>- internal static string StandardSql {- get {- return ResourceManager.GetString("StandardSql", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Transact-SQL.- /// </summary>- internal static string TransactSql {- get {- return ResourceManager.GetString("TransactSql", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to 2 spaces.- /// </summary>- internal static string TwoSpaces {- get {- return ResourceManager.GetString("TwoSpaces", resourceCulture);- }- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Formatters/Sql/SqlFormatter.resx b/src/app/dev/DevToys.Tools/Tools/Formatters/Sql/SqlFormatter.resxdeleted file mode 100644index e1fe50533..000000000--- a/src/app/dev/DevToys.Tools/Tools/Formatters/Sql/SqlFormatter.resx+++ /dev/null@@ -1,213 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<root>- <!--- Microsoft ResX Schema-- Version 2.0-- The primary goals of this format is to allow a simple XML format- that is mostly human readable. The generation and parsing of the- various data types are done through the TypeConverter classes- associated with the data types.-- Example:-- ... ado.net/XML headers & schema ...- <resheader name="resmimetype">text/microsoft-resx</resheader>- <resheader name="version">2.0</resheader>- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">- <value>[base64 mime encoded serialized .NET Framework object]</value>- </data>- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>- <comment>This is a comment</comment>- </data>-- There are any number of "resheader" rows that contain simple- name/value pairs.-- Each data row contains a name, and value. The row also contains a- type or mimetype. Type corresponds to a .NET class that support- text/value conversion through the TypeConverter architecture.- Classes that don't support this are serialized and stored with the- mimetype set.-- The mimetype is used for serialized objects, and tells the- ResXResourceReader how to depersist the object. This is currently not- extensible. For a given mimetype the value must be set accordingly:-- Note - application/x-microsoft.net.object.binary.base64 is the format- that the ResXResourceWriter will generate, however the reader can- read any of the formats listed below.-- mimetype: application/x-microsoft.net.object.binary.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.soap.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.bytearray.base64- value : The object must be serialized into a byte array- : using a System.ComponentModel.TypeConverter- : and then encoded with base64 encoding.- -->- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />- <xsd:element name="root" msdata:IsDataSet="true">- <xsd:complexType>- <xsd:choice maxOccurs="unbounded">- <xsd:element name="metadata">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" />- </xsd:sequence>- <xsd:attribute name="name" use="required" type="xsd:string" />- <xsd:attribute name="type" type="xsd:string" />- <xsd:attribute name="mimetype" type="xsd:string" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="assembly">- <xsd:complexType>- <xsd:attribute name="alias" type="xsd:string" />- <xsd:attribute name="name" type="xsd:string" />- </xsd:complexType>- </xsd:element>- <xsd:element name="data">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="resheader">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" />- </xsd:complexType>- </xsd:element>- </xsd:choice>- </xsd:complexType>- </xsd:element>- </xsd:schema>- <resheader name="resmimetype">- <value>text/microsoft-resx</value>- </resheader>- <resheader name="version">- <value>2.0</value>- </resheader>- <resheader name="reader">- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <resheader name="writer">- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <data name="AccessibleName" xml:space="preserve">- <value>SQL Formatter tool</value>- </data>- <data name="Configuration" xml:space="preserve">- <value>Configuration</value>- </data>- <data name="Db2" xml:space="preserve">- <value>Db2</value>- </data>- <data name="Description" xml:space="preserve">- <value>Format SQL data</value>- </data>- <data name="FourSpaces" xml:space="preserve">- <value>4 spaces</value>- </data>- <data name="Indentation" xml:space="preserve">- <value>Indentation</value>- </data>- <data name="IndentationOptionDescription" xml:space="preserve">- <value>Select which indentation you want to use</value>- </data>- <data name="Input" xml:space="preserve">- <value>Input</value>- </data>- <data name="InputFileNotFound" xml:space="preserve">- <value>Input file selected doesn't exist.</value>- </data>- <data name="InputOptionDescription" xml:space="preserve">- <value>Text or path to a file containing the sql to format</value>- </data>- <data name="InvalidInputOrFileCommand" xml:space="preserve">- <value>Please specify an input text or an input file</value>- </data>- <data name="LeadingComma" xml:space="preserve">- <value>Leading comma</value>- </data>- <data name="LeadingCommaDescription" xml:space="preserve">- <value>Whether to use leading commas or not</value>- </data>- <data name="LongDisplayTitle" xml:space="preserve">- <value>SQL Formatter</value>- </data>- <data name="MariaDb" xml:space="preserve">- <value>MariaDB</value>- </data>- <data name="MySql" xml:space="preserve">- <value>MySQL</value>- </data>- <data name="N1ql" xml:space="preserve">- <value>N1QL</value>- </data>- <data name="OneTab" xml:space="preserve">- <value>1 tab</value>- </data>- <data name="Output" xml:space="preserve">- <value>Output</value>- </data>- <data name="OutputFileOptionDescription" xml:space="preserve">- <value>Path to the output file</value>- </data>- <data name="PlSql" xml:space="preserve">- <value>PL/SQL</value>- </data>- <data name="PostgreSql" xml:space="preserve">- <value>PostgreSQL</value>- </data>- <data name="RedShift" xml:space="preserve">- <value>Amazon Redshift</value>- </data>- <data name="SearchDisplayName" xml:space="preserve">- <value>SQL Formatter</value>- </data>- <data name="ShortDisplayTitle" xml:space="preserve">- <value>SQL</value>- </data>- <data name="SparkSql" xml:space="preserve">- <value>Spark SQL</value>- </data>- <data name="SqlLanguage" xml:space="preserve">- <value>Language</value>- </data>- <data name="SqlLanguageDescription" xml:space="preserve">- <value>Which SQL language to use</value>- </data>- <data name="StandardSql" xml:space="preserve">- <value>Standard SQL</value>- </data>- <data name="TransactSql" xml:space="preserve">- <value>Transact-SQL</value>- </data>- <data name="TwoSpaces" xml:space="preserve">- <value>2 spaces</value>- </data>-</root>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/Formatters/Sql/SqlFormatterCommandLineTool.cs b/src/app/dev/DevToys.Tools/Tools/Formatters/Sql/SqlFormatterCommandLineTool.csdeleted file mode 100644index 5b2301e4a..000000000--- a/src/app/dev/DevToys.Tools/Tools/Formatters/Sql/SqlFormatterCommandLineTool.cs+++ /dev/null@@ -1,86 +0,0 @@-using DevToys.Tools.Helpers.SqlFormatter;-using DevToys.Tools.Helpers;-using DevToys.Tools.Models;-using Microsoft.Extensions.Logging;-using OneOf;--namespace DevToys.Tools.Tools.Formatters.Sql;--[Export(typeof(ICommandLineTool))]-[Name("SqlFormatter")]-[CommandName(- Name = "sqlFormatter",- Alias = "sqlf",- ResourceManagerBaseName = "DevToys.Tools.Tools.Formatters.Sql.SqlFormatter",- DescriptionResourceName = nameof(SqlFormatter.Description))]-internal sealed class SqlFormatterCommandLineTool : ICommandLineTool-{-#pragma warning disable IDE0044 // Add readonly modifier- [Import]- private IFileStorage _fileStorage = null!;-#pragma warning restore IDE0044 // Add readonly modifier-- [CommandLineOption(- Name = "input",- Alias = "i",- IsRequired = true,- DescriptionResourceName = nameof(SqlFormatter.InputOptionDescription))]- internal OneOf<FileInfo, string>? Input { get; set; }-- [CommandLineOption(- Name = "outputFile",- Alias = "o",- DescriptionResourceName = nameof(SqlFormatter.OutputFileOptionDescription))]- internal FileInfo? OutputFile { get; set; }-- [CommandLineOption(- Name = "indentation",- DescriptionResourceName = nameof(SqlFormatter.IndentationOptionDescription))]- internal Indentation IndentationMode { get; set; } = Indentation.TwoSpaces;-- [CommandLineOption(- Name = "language",- DescriptionResourceName = nameof(SqlFormatter.SqlLanguageDescription))]- internal SqlLanguage SqlLanguage { get; set; } = SqlLanguage.Sql;-- [CommandLineOption(- Name = "leadingComma",- DescriptionResourceName = nameof(SqlFormatter.LeadingCommaDescription))]- internal bool UseLeadingComma { get; set; } = false;-- public async ValueTask<int> InvokeAsync(ILogger logger, CancellationToken cancellationToken)- {- if (!Input.HasValue)- {- Console.Error.WriteLine(SqlFormatter.InvalidInputOrFileCommand);- return -1;- }-- ResultInfo<string> input = await Input.Value.ReadAllTextAsync(_fileStorage, cancellationToken);- if (!input.HasSucceeded)- {- Console.Error.WriteLine(SqlFormatter.InputFileNotFound);- return -1;- }-- Guard.IsNotNull(input.Data);- string formatResult = SqlFormatterHelper.Format(- input.Data,- SqlLanguage,- new SqlFormatterOptions(- IndentationMode,- Uppercase: true,- LinesBetweenQueries: 2,- UseLeadingComma: UseLeadingComma));-- cancellationToken.ThrowIfCancellationRequested();-- if (string.IsNullOrEmpty(formatResult))- {- return -1;- }-- await FileHelper.WriteOutputAsync(formatResult, OutputFile, cancellationToken);- return 0;- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Formatters/Sql/SqlFormatterGuiTool.cs b/src/app/dev/DevToys.Tools/Tools/Formatters/Sql/SqlFormatterGuiTool.csdeleted file mode 100644index b1c9781ea..000000000--- a/src/app/dev/DevToys.Tools/Tools/Formatters/Sql/SqlFormatterGuiTool.cs+++ /dev/null@@ -1,210 +0,0 @@-using DevToys.Tools.Helpers.SqlFormatter;-using DevToys.Tools.Models;-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.Tools.Formatters.Sql;--[Export(typeof(IGuiTool))]-[Name("SqlFormatter")]-[ToolDisplayInformation(- IconFontName = "DevToys-Tools-Icons",- IconGlyph = '\u0114',- GroupName = PredefinedCommonToolGroupNames.Formatters,- ResourceManagerAssemblyIdentifier = nameof(DevToysToolsResourceManagerAssemblyIdentifier),- ResourceManagerBaseName = "DevToys.Tools.Tools.Formatters.Sql.SqlFormatter",- ShortDisplayTitleResourceName = nameof(SqlFormatter.ShortDisplayTitle),- LongDisplayTitleResourceName = nameof(SqlFormatter.LongDisplayTitle),- DescriptionResourceName = nameof(SqlFormatter.Description),- AccessibleNameResourceName = nameof(SqlFormatter.AccessibleName))]-internal sealed partial class SqlFormatterGuiTool : IGuiTool, IDisposable-{- /// <summary>- /// Which indentation the tool should use.- /// </summary>- private static readonly SettingDefinition<Indentation> indentationMode- = new(name: $"{nameof(SqlFormatterGuiTool)}.{nameof(indentationMode)}", defaultValue: Indentation.TwoSpaces);-- /// <summary>- /// The SQL language to consider when formatting.- /// </summary>- private static readonly SettingDefinition<SqlLanguage> sqlLanguage- = new(name: $"{nameof(SqlFormatterGuiTool)}.{nameof(sqlLanguage)}", defaultValue: SqlLanguage.Sql);-- /// <summary>- /// Whether to use leading commas in the formatted SQL queries.- /// </summary>- private static readonly SettingDefinition<bool> useLeadingComma- = new(name: $"{nameof(SqlFormatterGuiTool)}.{nameof(useLeadingComma)}", defaultValue: false);-- private enum GridColumn- {- Content- }-- private enum GridRow- {- Header,- Content,- Footer- }-- private readonly DisposableSemaphore _semaphore = new();- private readonly ILogger _logger;- private readonly ISettingsProvider _settingsProvider;- private readonly IUIMultiLineTextInput _inputTextArea = MultilineTextInput("sql-input-text-area");- private readonly IUIMultiLineTextInput _outputTextArea = MultilineTextInput("sql-output-text-area");-- private CancellationTokenSource? _cancellationTokenSource;-- [ImportingConstructor]- public SqlFormatterGuiTool(ISettingsProvider settingsProvider)- {- _logger = this.Log();- _settingsProvider = settingsProvider;- }-- internal Task? WorkTask { get; private set; }-- public UIToolView View- => new(- isScrollable: true,- Grid()- .ColumnLargeSpacing()- .RowLargeSpacing()- .Rows(- (GridRow.Header, Auto),- (GridRow.Content, new UIGridLength(1, UIGridUnitType.Fraction))- )- .Columns(- (GridColumn.Content, new UIGridLength(1, UIGridUnitType.Fraction))- )- .Cells(- Cell(- GridRow.Header,- GridColumn.Content,- Stack().Vertical().WithChildren(- Label().Text(SqlFormatter.Configuration),- Setting("sql-text-newLineOnAttributes-setting")- .Icon("FluentSystemIcons", '\uF2EF')- .Title(SqlFormatter.SqlLanguage)- .Handle(- _settingsProvider,- sqlLanguage,- OnSqlLanguageChanged,- Item(SqlFormatter.Db2, SqlLanguage.Db2),- Item(SqlFormatter.MariaDb, SqlLanguage.MariaDb),- Item(SqlFormatter.MySql, SqlLanguage.MySql),- Item(SqlFormatter.N1ql, SqlLanguage.N1ql),- Item(SqlFormatter.PlSql, SqlLanguage.PlSql),- Item(SqlFormatter.PostgreSql, SqlLanguage.PostgreSql),- Item(SqlFormatter.RedShift, SqlLanguage.RedShift),- Item(SqlFormatter.SparkSql, SqlLanguage.Spark),- Item(SqlFormatter.StandardSql, SqlLanguage.Sql),- Item(SqlFormatter.TransactSql, SqlLanguage.Tsql)- ),- Setting("sql-text-indentation-setting")- .Icon("FluentSystemIcons", '\uF6F8')- .Title(SqlFormatter.Indentation)- .Handle(- _settingsProvider,- indentationMode,- OnIndentationModelChanged,- Item(SqlFormatter.TwoSpaces, Indentation.TwoSpaces),- Item(SqlFormatter.FourSpaces, Indentation.FourSpaces),- Item(SqlFormatter.OneTab, Indentation.OneTab)- ),- Setting("sql-leading-comma-setting")- .Icon("FluentSystemIcons", '\uF18D')- .Title(SqlFormatter.LeadingComma)- .Handle(- _settingsProvider,- useLeadingComma,- OnUseLeadingCommaChanged- )- )- ),- Cell(- GridRow.Content,- GridColumn.Content,- SplitGrid()- .Vertical()- .WithLeftPaneChild(- _inputTextArea- .Language("sql")- .Title(SqlFormatter.Input)- .OnTextChanged(OnInputTextChanged))- .WithRightPaneChild(- _outputTextArea- .Language("sql")- .Title(SqlFormatter.Output)- .ReadOnly()- .Extendable())- )- )- );-- // Smart detection handler.- public void OnDataReceived(string dataTypeName, object? parsedData)- {- }-- public void Dispose()- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _semaphore.Dispose();- }-- private void OnIndentationModelChanged(Indentation indentationMode)- {- StartFormat(_inputTextArea.Text);- }-- private void OnSqlLanguageChanged(SqlLanguage sqlLanguage)- {- StartFormat(_inputTextArea.Text);- }-- private void OnUseLeadingCommaChanged(bool useLeadingComma)- {- StartFormat(_inputTextArea.Text);- }-- private void OnInputTextChanged(string text)- {- StartFormat(text);- }-- private void StartFormat(string text)- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _cancellationTokenSource = new CancellationTokenSource();-- WorkTask = FormatAsync(- text,- _settingsProvider.GetSetting(indentationMode),- _settingsProvider.GetSetting(sqlLanguage),- _settingsProvider.GetSetting(useLeadingComma),- _cancellationTokenSource.Token);- }-- private async Task FormatAsync(string input, Indentation indentationSetting, SqlLanguage sqlLanguageSetting, bool useLeadingComma, CancellationToken cancellationToken)- {- using (await _semaphore.WaitAsync(cancellationToken))- {- await TaskSchedulerAwaiter.SwitchOffMainThreadAsync(cancellationToken);-- string formatResult = SqlFormatterHelper.Format(- input,- sqlLanguageSetting,- new SqlFormatterOptions(- indentationSetting,- Uppercase: true,- LinesBetweenQueries: 2,- UseLeadingComma: useLeadingComma));-- _outputTextArea.Text(formatResult);- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Formatters/Xml/XmlFormatter.Designer.cs b/src/app/dev/DevToys.Tools/Tools/Formatters/Xml/XmlFormatter.Designer.csdeleted file mode 100644index a0ee79d2f..000000000--- a/src/app/dev/DevToys.Tools/Tools/Formatters/Xml/XmlFormatter.Designer.cs+++ /dev/null@@ -1,234 +0,0 @@-//-------------------------------------------------------------------------------// <auto-generated>-// This code was generated by a tool.-// Runtime Version:4.0.30319.42000-//-// Changes to this file may cause incorrect behavior and will be lost if-// the code is regenerated.-// </auto-generated>-//--------------------------------------------------------------------------------namespace DevToys.Tools.Tools.Formatters.Xml {- using System;--- /// <summary>- /// A strongly-typed resource class, for looking up localized strings, etc.- /// </summary>- // This class was auto-generated by the StronglyTypedResourceBuilder- // class via a tool like ResGen or Visual Studio.- // To add or remove a member, edit your .ResX file then rerun ResGen- // with the /str option, or rebuild your VS project.- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]- internal class XmlFormatter {-- private static global::System.Resources.ResourceManager resourceMan;-- private static global::System.Globalization.CultureInfo resourceCulture;-- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]- internal XmlFormatter() {- }-- /// <summary>- /// Returns the cached ResourceManager instance used by this class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Resources.ResourceManager ResourceManager {- get {- if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Tools.Tools.Formatters.Xml.XmlFormatter", typeof(XmlFormatter).Assembly);- resourceMan = temp;- }- return resourceMan;- }- }-- /// <summary>- /// Overrides the current thread's CurrentUICulture property for all- /// resource lookups using this strongly typed resource class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Globalization.CultureInfo Culture {- get {- return resourceCulture;- }- set {- resourceCulture = value;- }- }-- /// <summary>- /// Looks up a localized string similar to XML Formatter tool.- /// </summary>- internal static string AccessibleName {- get {- return ResourceManager.GetString("AccessibleName", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Configuration.- /// </summary>- internal static string Configuration {- get {- return ResourceManager.GetString("Configuration", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Indent or minify XML data.- /// </summary>- internal static string Description {- get {- return ResourceManager.GetString("Description", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to 4 spaces.- /// </summary>- internal static string FourSpaces {- get {- return ResourceManager.GetString("FourSpaces", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Indentation.- /// </summary>- internal static string Indentation {- get {- return ResourceManager.GetString("Indentation", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Select which indentation you want to use.- /// </summary>- internal static string IndentationOptionDescription {- get {- return ResourceManager.GetString("IndentationOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Input.- /// </summary>- internal static string Input {- get {- return ResourceManager.GetString("Input", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Input file selected doesn't exist..- /// </summary>- internal static string InputFileNotFound {- get {- return ResourceManager.GetString("InputFileNotFound", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Text or path to a file containing the xml to format.- /// </summary>- internal static string InputOptionDescription {- get {- return ResourceManager.GetString("InputOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Please specify an input text or an input file.- /// </summary>- internal static string InvalidInputOrFileCommand {- get {- return ResourceManager.GetString("InvalidInputOrFileCommand", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to XML Formatter.- /// </summary>- internal static string LongDisplayTitle {- get {- return ResourceManager.GetString("LongDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Minified.- /// </summary>- internal static string Minified {- get {- return ResourceManager.GetString("Minified", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Put attributes on a new line.- /// </summary>- internal static string NewLineOnAttributes {- get {- return ResourceManager.GetString("NewLineOnAttributes", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Whether to put attributes on a new line.- /// </summary>- internal static string NewLineOnAttributesDescription {- get {- return ResourceManager.GetString("NewLineOnAttributesDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to 1 tab.- /// </summary>- internal static string OneTab {- get {- return ResourceManager.GetString("OneTab", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Output.- /// </summary>- internal static string Output {- get {- return ResourceManager.GetString("Output", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Path to the output file.- /// </summary>- internal static string OutputFileOptionDescription {- get {- return ResourceManager.GetString("OutputFileOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to XML.- /// </summary>- internal static string ShortDisplayTitle {- get {- return ResourceManager.GetString("ShortDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to 2 spaces.- /// </summary>- internal static string TwoSpaces {- get {- return ResourceManager.GetString("TwoSpaces", resourceCulture);- }- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Formatters/Xml/XmlFormatter.resx b/src/app/dev/DevToys.Tools/Tools/Formatters/Xml/XmlFormatter.resxdeleted file mode 100644index 4c7fb2cda..000000000--- a/src/app/dev/DevToys.Tools/Tools/Formatters/Xml/XmlFormatter.resx+++ /dev/null@@ -1,177 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<root>- <!--- Microsoft ResX Schema-- Version 2.0-- The primary goals of this format is to allow a simple XML format- that is mostly human readable. The generation and parsing of the- various data types are done through the TypeConverter classes- associated with the data types.-- Example:-- ... ado.net/XML headers & schema ...- <resheader name="resmimetype">text/microsoft-resx</resheader>- <resheader name="version">2.0</resheader>- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">- <value>[base64 mime encoded serialized .NET Framework object]</value>- </data>- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>- <comment>This is a comment</comment>- </data>-- There are any number of "resheader" rows that contain simple- name/value pairs.-- Each data row contains a name, and value. The row also contains a- type or mimetype. Type corresponds to a .NET class that support- text/value conversion through the TypeConverter architecture.- Classes that don't support this are serialized and stored with the- mimetype set.-- The mimetype is used for serialized objects, and tells the- ResXResourceReader how to depersist the object. This is currently not- extensible. For a given mimetype the value must be set accordingly:-- Note - application/x-microsoft.net.object.binary.base64 is the format- that the ResXResourceWriter will generate, however the reader can- read any of the formats listed below.-- mimetype: application/x-microsoft.net.object.binary.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.soap.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.bytearray.base64- value : The object must be serialized into a byte array- : using a System.ComponentModel.TypeConverter- : and then encoded with base64 encoding.- -->- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />- <xsd:element name="root" msdata:IsDataSet="true">- <xsd:complexType>- <xsd:choice maxOccurs="unbounded">- <xsd:element name="metadata">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" />- </xsd:sequence>- <xsd:attribute name="name" use="required" type="xsd:string" />- <xsd:attribute name="type" type="xsd:string" />- <xsd:attribute name="mimetype" type="xsd:string" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="assembly">- <xsd:complexType>- <xsd:attribute name="alias" type="xsd:string" />- <xsd:attribute name="name" type="xsd:string" />- </xsd:complexType>- </xsd:element>- <xsd:element name="data">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="resheader">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" />- </xsd:complexType>- </xsd:element>- </xsd:choice>- </xsd:complexType>- </xsd:element>- </xsd:schema>- <resheader name="resmimetype">- <value>text/microsoft-resx</value>- </resheader>- <resheader name="version">- <value>2.0</value>- </resheader>- <resheader name="reader">- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <resheader name="writer">- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <data name="AccessibleName" xml:space="preserve">- <value>XML Formatter tool</value>- </data>- <data name="Configuration" xml:space="preserve">- <value>Configuration</value>- </data>- <data name="Description" xml:space="preserve">- <value>Indent or minify XML data</value>- </data>- <data name="FourSpaces" xml:space="preserve">- <value>4 spaces</value>- </data>- <data name="Indentation" xml:space="preserve">- <value>Indentation</value>- </data>- <data name="IndentationOptionDescription" xml:space="preserve">- <value>Select which indentation you want to use</value>- </data>- <data name="Input" xml:space="preserve">- <value>Input</value>- </data>- <data name="InputFileNotFound" xml:space="preserve">- <value>Input file selected doesn't exist.</value>- </data>- <data name="InputOptionDescription" xml:space="preserve">- <value>Text or path to a file containing the xml to format</value>- </data>- <data name="InvalidInputOrFileCommand" xml:space="preserve">- <value>Please specify an input text or an input file</value>- </data>- <data name="LongDisplayTitle" xml:space="preserve">- <value>XML Formatter</value>- </data>- <data name="Minified" xml:space="preserve">- <value>Minified</value>- </data>- <data name="NewLineOnAttributes" xml:space="preserve">- <value>Put attributes on a new line</value>- </data>- <data name="NewLineOnAttributesDescription" xml:space="preserve">- <value>Whether to put attributes on a new line</value>- </data>- <data name="OneTab" xml:space="preserve">- <value>1 tab</value>- </data>- <data name="Output" xml:space="preserve">- <value>Output</value>- </data>- <data name="OutputFileOptionDescription" xml:space="preserve">- <value>Path to the output file</value>- </data>- <data name="ShortDisplayTitle" xml:space="preserve">- <value>XML</value>- </data>- <data name="TwoSpaces" xml:space="preserve">- <value>2 spaces</value>- </data>-</root>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/Formatters/Xml/XmlFormatterCommandLineTool.cs b/src/app/dev/DevToys.Tools/Tools/Formatters/Xml/XmlFormatterCommandLineTool.csdeleted file mode 100644index b9871a3f2..000000000--- a/src/app/dev/DevToys.Tools/Tools/Formatters/Xml/XmlFormatterCommandLineTool.cs+++ /dev/null@@ -1,78 +0,0 @@-using DevToys.Tools.Helpers;-using DevToys.Tools.Models;-using Microsoft.Extensions.Logging;-using OneOf;--namespace DevToys.Tools.Tools.Formatters.Xml;--[Export(typeof(ICommandLineTool))]-[Name("XmlFormatter")]-[CommandName(- Name = "xmlFormatter",- Alias = "xmlf",- ResourceManagerBaseName = "DevToys.Tools.Tools.Formatters.Xml.XmlFormatter",- DescriptionResourceName = nameof(XmlFormatter.Description))]-internal sealed class XmlFormatterCommandLineTool : ICommandLineTool-{-#pragma warning disable IDE0044 // Add readonly modifier- [Import]- private IFileStorage _fileStorage = null!;-#pragma warning restore IDE0044 // Add readonly modifier-- [CommandLineOption(- Name = "input",- Alias = "i",- IsRequired = true,- DescriptionResourceName = nameof(XmlFormatter.InputOptionDescription))]- internal OneOf<FileInfo, string>? Input { get; set; }-- [CommandLineOption(- Name = "outputFile",- Alias = "o",- DescriptionResourceName = nameof(XmlFormatter.OutputFileOptionDescription))]- internal FileInfo? OutputFile { get; set; }-- [CommandLineOption(- Name = "indentation",- DescriptionResourceName = nameof(XmlFormatter.IndentationOptionDescription))]- internal Indentation IndentationMode { get; set; } = Indentation.TwoSpaces;-- [CommandLineOption(- Name = "newLineOnAttributes",- DescriptionResourceName = nameof(XmlFormatter.NewLineOnAttributesDescription))]- internal bool NewLineOnAttributes { get; set; } = false;-- public async ValueTask<int> InvokeAsync(ILogger logger, CancellationToken cancellationToken)- {- if (!Input.HasValue)- {- Console.Error.WriteLine(XmlFormatter.InvalidInputOrFileCommand);- return -1;- }-- ResultInfo<string> input = await Input.Value.ReadAllTextAsync(_fileStorage, cancellationToken);- if (!input.HasSucceeded)- {- Console.Error.WriteLine(XmlFormatter.InputFileNotFound);- return -1;- }-- Guard.IsNotNull(input.Data);- ResultInfo<string> formatResult = XmlHelper.Format(- input.Data,- IndentationMode,- NewLineOnAttributes,- logger);-- cancellationToken.ThrowIfCancellationRequested();-- if (!formatResult.HasSucceeded)- {- Console.Error.WriteLine(formatResult.Data);- return -1;- }-- await FileHelper.WriteOutputAsync(formatResult.Data, OutputFile, cancellationToken);- return 0;- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Formatters/Xml/XmlFormatterGuiTool.cs b/src/app/dev/DevToys.Tools/Tools/Formatters/Xml/XmlFormatterGuiTool.csdeleted file mode 100644index f910a8c21..000000000--- a/src/app/dev/DevToys.Tools/Tools/Formatters/Xml/XmlFormatterGuiTool.cs+++ /dev/null@@ -1,181 +0,0 @@-using DevToys.Tools.Helpers;-using DevToys.Tools.Models;-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.Tools.Formatters.Xml;--[Export(typeof(IGuiTool))]-[Name("XmlFormatter")]-[ToolDisplayInformation(- IconFontName = "DevToys-Tools-Icons",- IconGlyph = '\u0122',- GroupName = PredefinedCommonToolGroupNames.Formatters,- ResourceManagerAssemblyIdentifier = nameof(DevToysToolsResourceManagerAssemblyIdentifier),- ResourceManagerBaseName = "DevToys.Tools.Tools.Formatters.Xml.XmlFormatter",- ShortDisplayTitleResourceName = nameof(XmlFormatter.ShortDisplayTitle),- LongDisplayTitleResourceName = nameof(XmlFormatter.LongDisplayTitle),- DescriptionResourceName = nameof(XmlFormatter.Description),- AccessibleNameResourceName = nameof(XmlFormatter.AccessibleName))]-[AcceptedDataTypeName(PredefinedCommonDataTypeNames.Xml)]-internal sealed partial class XmlFormatterGuiTool : IGuiTool, IDisposable-{- /// <summary>- /// Which indentation the tool need to use.- /// </summary>- private static readonly SettingDefinition<Indentation> indentationMode- = new(name: $"{nameof(XmlFormatterGuiTool)}.{nameof(indentationMode)}", defaultValue: Indentation.TwoSpaces);-- /// <summary>- /// Whether XML attributes are put on a new line- /// </summary>- private static readonly SettingDefinition<bool> newLineOnAttributes- = new(name: $"{nameof(XmlFormatterGuiTool)}.{nameof(newLineOnAttributes)}", defaultValue: false);-- private enum GridColumn- {- Content- }-- private enum GridRow- {- Header,- Content,- Footer- }-- private readonly DisposableSemaphore _semaphore = new();- private readonly ILogger _logger;- private readonly ISettingsProvider _settingsProvider;- private readonly IUIMultiLineTextInput _inputTextArea = MultilineTextInput("xml-input-text-area");- private readonly IUIMultiLineTextInput _outputTextArea = MultilineTextInput("xml-output-text-area");-- private CancellationTokenSource? _cancellationTokenSource;-- [ImportingConstructor]- public XmlFormatterGuiTool(ISettingsProvider settingsProvider)- {- _logger = this.Log();- _settingsProvider = settingsProvider;- }-- internal Task? WorkTask { get; private set; }-- public UIToolView View- => new(- isScrollable: true,- Grid()- .ColumnLargeSpacing()- .RowLargeSpacing()- .Rows(- (GridRow.Header, Auto),- (GridRow.Content, new UIGridLength(1, UIGridUnitType.Fraction))- )- .Columns(- (GridColumn.Content, new UIGridLength(1, UIGridUnitType.Fraction))- )- .Cells(- Cell(- GridRow.Header,- GridColumn.Content,- Stack().Vertical().WithChildren(- Label().Text(XmlFormatter.Configuration),- Setting("xml-text-indentation-setting")- .Icon("FluentSystemIcons", '\uF6F8')- .Title(XmlFormatter.Indentation)- .Handle(- _settingsProvider,- indentationMode,- OnIndentationModelChanged,- Item(XmlFormatter.TwoSpaces, Indentation.TwoSpaces),- Item(XmlFormatter.FourSpaces, Indentation.FourSpaces),- Item(XmlFormatter.OneTab, Indentation.OneTab),- Item(XmlFormatter.Minified, Indentation.Minified)- ),- Setting("xml-text-newLineOnAttributes-setting")- .Icon("FluentSystemIcons", '\uf7ed')- .Title(XmlFormatter.NewLineOnAttributes)- .Description(XmlFormatter.NewLineOnAttributesDescription)- .Handle(- _settingsProvider,- newLineOnAttributes,- OnSettingChanged- )- )- ),- Cell(- GridRow.Content,- GridColumn.Content,- SplitGrid()- .Vertical()- .WithLeftPaneChild(- _inputTextArea- .Language("xml")- .Title(XmlFormatter.Input)- .OnTextChanged(OnInputTextChanged))- .WithRightPaneChild(- _outputTextArea- .Language("xml")- .Title(XmlFormatter.Output)- .ReadOnly()- .Extendable())- )- )- );-- // Smart detection handler.- public void OnDataReceived(string dataTypeName, object? parsedData)- {- if (dataTypeName == PredefinedCommonDataTypeNames.Xml &&- parsedData is string xmlStrongTypedParsedData)- {- _inputTextArea.Text(xmlStrongTypedParsedData);- }- }-- public void Dispose()- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _semaphore.Dispose();- }-- private void OnSettingChanged(bool value)- {- StartFormat(_inputTextArea.Text);- }-- private void OnIndentationModelChanged(Indentation indentationMode)- {- StartFormat(_inputTextArea.Text);- }-- private void OnInputTextChanged(string text)- {- StartFormat(text);- }-- private void StartFormat(string text)- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _cancellationTokenSource = new CancellationTokenSource();-- WorkTask = FormatAsync(text, _settingsProvider.GetSetting(indentationMode), _settingsProvider.GetSetting(newLineOnAttributes), _cancellationTokenSource.Token);- }-- private async Task FormatAsync(string input, Indentation indentationSetting, bool newLineOnAttributeSetting, CancellationToken cancellationToken)- {- using (await _semaphore.WaitAsync(cancellationToken))- {- await TaskSchedulerAwaiter.SwitchOffMainThreadAsync(cancellationToken);-- ResultInfo<string> formatResult = XmlHelper.Format(- input,- indentationSetting,- newLineOnAttributeSetting,- _logger);-- _outputTextArea.Text(formatResult.Data);- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Generators/Generators.Designer.cs b/src/app/dev/DevToys.Tools/Tools/Generators/Generators.Designer.csdeleted file mode 100644index d74842cb0..000000000--- a/src/app/dev/DevToys.Tools/Tools/Generators/Generators.Designer.cs+++ /dev/null@@ -1,81 +0,0 @@-//-------------------------------------------------------------------------------// <auto-generated>-// This code was generated by a tool.-// Runtime Version:4.0.30319.42000-//-// Changes to this file may cause incorrect behavior and will be lost if-// the code is regenerated.-// </auto-generated>-//--------------------------------------------------------------------------------namespace DevToys.Tools.Tools.Generators {- using System;--- /// <summary>- /// A strongly-typed resource class, for looking up localized strings, etc.- /// </summary>- // This class was auto-generated by the StronglyTypedResourceBuilder- // class via a tool like ResGen or Visual Studio.- // To add or remove a member, edit your .ResX file then rerun ResGen- // with the /str option, or rebuild your VS project.- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]- internal class Generators {-- private static global::System.Resources.ResourceManager resourceMan;-- private static global::System.Globalization.CultureInfo resourceCulture;-- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]- internal Generators() {- }-- /// <summary>- /// Returns the cached ResourceManager instance used by this class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Resources.ResourceManager ResourceManager {- get {- if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Tools.Tools.Generators.Generators", typeof(Generators).Assembly);- resourceMan = temp;- }- return resourceMan;- }- }-- /// <summary>- /// Overrides the current thread's CurrentUICulture property for all- /// resource lookups using this strongly typed resource class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Globalization.CultureInfo Culture {- get {- return resourceCulture;- }- set {- resourceCulture = value;- }- }-- /// <summary>- /// Looks up a localized string similar to Generators.- /// </summary>- internal static string AccessibleName {- get {- return ResourceManager.GetString("AccessibleName", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Generators.- /// </summary>- internal static string DisplayTitle {- get {- return ResourceManager.GetString("DisplayTitle", resourceCulture);- }- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Generators/Generators.resx b/src/app/dev/DevToys.Tools/Tools/Generators/Generators.resxdeleted file mode 100644index 03dfbbd73..000000000--- a/src/app/dev/DevToys.Tools/Tools/Generators/Generators.resx+++ /dev/null@@ -1,126 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<root>- <!--- Microsoft ResX Schema-- Version 2.0-- The primary goals of this format is to allow a simple XML format- that is mostly human readable. The generation and parsing of the- various data types are done through the TypeConverter classes- associated with the data types.-- Example:-- ... ado.net/XML headers & schema ...- <resheader name="resmimetype">text/microsoft-resx</resheader>- <resheader name="version">2.0</resheader>- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">- <value>[base64 mime encoded serialized .NET Framework object]</value>- </data>- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>- <comment>This is a comment</comment>- </data>-- There are any number of "resheader" rows that contain simple- name/value pairs.-- Each data row contains a name, and value. The row also contains a- type or mimetype. Type corresponds to a .NET class that support- text/value conversion through the TypeConverter architecture.- Classes that don't support this are serialized and stored with the- mimetype set.-- The mimetype is used for serialized objects, and tells the- ResXResourceReader how to depersist the object. This is currently not- extensible. For a given mimetype the value must be set accordingly:-- Note - application/x-microsoft.net.object.binary.base64 is the format- that the ResXResourceWriter will generate, however the reader can- read any of the formats listed below.-- mimetype: application/x-microsoft.net.object.binary.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.soap.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.bytearray.base64- value : The object must be serialized into a byte array- : using a System.ComponentModel.TypeConverter- : and then encoded with base64 encoding.- -->- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />- <xsd:element name="root" msdata:IsDataSet="true">- <xsd:complexType>- <xsd:choice maxOccurs="unbounded">- <xsd:element name="metadata">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" />- </xsd:sequence>- <xsd:attribute name="name" use="required" type="xsd:string" />- <xsd:attribute name="type" type="xsd:string" />- <xsd:attribute name="mimetype" type="xsd:string" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="assembly">- <xsd:complexType>- <xsd:attribute name="alias" type="xsd:string" />- <xsd:attribute name="name" type="xsd:string" />- </xsd:complexType>- </xsd:element>- <xsd:element name="data">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="resheader">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" />- </xsd:complexType>- </xsd:element>- </xsd:choice>- </xsd:complexType>- </xsd:element>- </xsd:schema>- <resheader name="resmimetype">- <value>text/microsoft-resx</value>- </resheader>- <resheader name="version">- <value>2.0</value>- </resheader>- <resheader name="reader">- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <resheader name="writer">- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <data name="AccessibleName" xml:space="preserve">- <value>Generators</value>- </data>- <data name="DisplayTitle" xml:space="preserve">- <value>Generators</value>- </data>-</root>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/Generators/HashAndChecksum/HashAndChecksumGenerator.Designer.cs b/src/app/dev/DevToys.Tools/Tools/Generators/HashAndChecksum/HashAndChecksumGenerator.Designer.csdeleted file mode 100644index 38dacf63d..000000000--- a/src/app/dev/DevToys.Tools/Tools/Generators/HashAndChecksum/HashAndChecksumGenerator.Designer.cs+++ /dev/null@@ -1,279 +0,0 @@-//-------------------------------------------------------------------------------// <auto-generated>-// This code was generated by a tool.-// Runtime Version:4.0.30319.42000-//-// Changes to this file may cause incorrect behavior and will be lost if-// the code is regenerated.-// </auto-generated>-//--------------------------------------------------------------------------------namespace DevToys.Tools.Tools.Generators.HashAndChecksum {- using System;--- /// <summary>- /// A strongly-typed resource class, for looking up localized strings, etc.- /// </summary>- // This class was auto-generated by the StronglyTypedResourceBuilder- // class via a tool like ResGen or Visual Studio.- // To add or remove a member, edit your .ResX file then rerun ResGen- // with the /str option, or rebuild your VS project.- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]- internal class HashAndChecksumGenerator {-- private static global::System.Resources.ResourceManager resourceMan;-- private static global::System.Globalization.CultureInfo resourceCulture;-- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]- internal HashAndChecksumGenerator() {- }-- /// <summary>- /// Returns the cached ResourceManager instance used by this class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Resources.ResourceManager ResourceManager {- get {- if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Tools.Tools.Generators.HashAndChecksum.HashAndChecksumGenerator", typeof(HashAndChecksumGenerator).Assembly);- resourceMan = temp;- }- return resourceMan;- }- }-- /// <summary>- /// Overrides the current thread's CurrentUICulture property for all- /// resource lookups using this strongly typed resource class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Globalization.CultureInfo Culture {- get {- return resourceCulture;- }- set {- resourceCulture = value;- }- }-- /// <summary>- /// Looks up a localized string similar to Hash and Checksum Generator tool.- /// </summary>- internal static string AccessibleName {- get {- return ResourceManager.GetString("AccessibleName", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to FAILED.- /// </summary>- internal static string ChecksumVerificationFailed {- get {- return ResourceManager.GetString("ChecksumVerificationFailed", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to A text or file containing a checksum to verify data integrity.- /// </summary>- internal static string ChecksumVerificationOptionDescription {- get {- return ResourceManager.GetString("ChecksumVerificationOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to OK.- /// </summary>- internal static string ChecksumVerificationSucceeded {- get {- return ResourceManager.GetString("ChecksumVerificationSucceeded", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Checksum to verify data integrity.- /// </summary>- internal static string ChecksumVerificationTitle {- get {- return ResourceManager.GetString("ChecksumVerificationTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Configuration.- /// </summary>- internal static string ConfigurationTitle {- get {- return ResourceManager.GetString("ConfigurationTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Calculate hash from text or binary data.- /// </summary>- internal static string Description {- get {- return ResourceManager.GetString("Description", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The type of hash to generate.- /// </summary>- internal static string HashAlgorithmOptionDescription {- get {- return ResourceManager.GetString("HashAlgorithmOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The hashes are the same.- /// </summary>- internal static string HashesMatch {- get {- return ResourceManager.GetString("HashesMatch", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The hashes are different.- /// </summary>- internal static string HashesMismatch {- get {- return ResourceManager.GetString("HashesMismatch", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Select which hashing algorithm you want to use.- /// </summary>- internal static string HashingAlgorithmDescription {- get {- return ResourceManager.GetString("HashingAlgorithmDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Hashing Algorithm.- /// </summary>- internal static string HashingAlgorithmTitle {- get {- return ResourceManager.GetString("HashingAlgorithmTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Secret key to use to generate a HMAC hash.- /// </summary>- internal static string HmacSecret {- get {- return ResourceManager.GetString("HmacSecret", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Secret key to use to generate a HMAC hash.- /// </summary>- internal static string HmacSecretOptionDescription {- get {- return ResourceManager.GetString("HmacSecretOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Text or path to a file to hash.- /// </summary>- internal static string InputOptionDescription {- get {- return ResourceManager.GetString("InputOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Input text.- /// </summary>- internal static string InputTextTitle {- get {- return ResourceManager.GetString("InputTextTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Please specify an input text or an input file.- /// </summary>- internal static string InvalidInputOrFileCommand {- get {- return ResourceManager.GetString("InvalidInputOrFileCommand", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Hash / Checksum Generator.- /// </summary>- internal static string LongDisplayTitle {- get {- return ResourceManager.GetString("LongDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to or.- /// </summary>- internal static string Or {- get {- return ResourceManager.GetString("Or", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Output.- /// </summary>- internal static string OutputTitle {- get {- return ResourceManager.GetString("OutputTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Hash / Checksum.- /// </summary>- internal static string ShortDisplayTitle {- get {- return ResourceManager.GetString("ShortDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Hides the progress of the hashing operation.- /// </summary>- internal static string SilentOptionDescription {- get {- return ResourceManager.GetString("SilentOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Whether the generated hash should be in uppercase or not.- /// </summary>- internal static string UppercaseOptionDescription {- get {- return ResourceManager.GetString("UppercaseOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Uppercase.- /// </summary>- internal static string UppercaseTitle {- get {- return ResourceManager.GetString("UppercaseTitle", resourceCulture);- }- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Generators/HashAndChecksum/HashAndChecksumGenerator.resx b/src/app/dev/DevToys.Tools/Tools/Generators/HashAndChecksum/HashAndChecksumGenerator.resxdeleted file mode 100644index f92bd00ad..000000000--- a/src/app/dev/DevToys.Tools/Tools/Generators/HashAndChecksum/HashAndChecksumGenerator.resx+++ /dev/null@@ -1,192 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<root>- <!--- Microsoft ResX Schema-- Version 2.0-- The primary goals of this format is to allow a simple XML format- that is mostly human readable. The generation and parsing of the- various data types are done through the TypeConverter classes- associated with the data types.-- Example:-- ... ado.net/XML headers & schema ...- <resheader name="resmimetype">text/microsoft-resx</resheader>- <resheader name="version">2.0</resheader>- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">- <value>[base64 mime encoded serialized .NET Framework object]</value>- </data>- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>- <comment>This is a comment</comment>- </data>-- There are any number of "resheader" rows that contain simple- name/value pairs.-- Each data row contains a name, and value. The row also contains a- type or mimetype. Type corresponds to a .NET class that support- text/value conversion through the TypeConverter architecture.- Classes that don't support this are serialized and stored with the- mimetype set.-- The mimetype is used for serialized objects, and tells the- ResXResourceReader how to depersist the object. This is currently not- extensible. For a given mimetype the value must be set accordingly:-- Note - application/x-microsoft.net.object.binary.base64 is the format- that the ResXResourceWriter will generate, however the reader can- read any of the formats listed below.-- mimetype: application/x-microsoft.net.object.binary.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.soap.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.bytearray.base64- value : The object must be serialized into a byte array- : using a System.ComponentModel.TypeConverter- : and then encoded with base64 encoding.- -->- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />- <xsd:element name="root" msdata:IsDataSet="true">- <xsd:complexType>- <xsd:choice maxOccurs="unbounded">- <xsd:element name="metadata">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" />- </xsd:sequence>- <xsd:attribute name="name" use="required" type="xsd:string" />- <xsd:attribute name="type" type="xsd:string" />- <xsd:attribute name="mimetype" type="xsd:string" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="assembly">- <xsd:complexType>- <xsd:attribute name="alias" type="xsd:string" />- <xsd:attribute name="name" type="xsd:string" />- </xsd:complexType>- </xsd:element>- <xsd:element name="data">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="resheader">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" />- </xsd:complexType>- </xsd:element>- </xsd:choice>- </xsd:complexType>- </xsd:element>- </xsd:schema>- <resheader name="resmimetype">- <value>text/microsoft-resx</value>- </resheader>- <resheader name="version">- <value>2.0</value>- </resheader>- <resheader name="reader">- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <resheader name="writer">- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <data name="AccessibleName" xml:space="preserve">- <value>Hash and Checksum Generator tool</value>- </data>- <data name="ChecksumVerificationFailed" xml:space="preserve">- <value>FAILED</value>- </data>- <data name="ChecksumVerificationOptionDescription" xml:space="preserve">- <value>A text or file containing a checksum to verify data integrity</value>- </data>- <data name="ChecksumVerificationSucceeded" xml:space="preserve">- <value>OK</value>- </data>- <data name="ChecksumVerificationTitle" xml:space="preserve">- <value>Checksum to verify data integrity</value>- </data>- <data name="ConfigurationTitle" xml:space="preserve">- <value>Configuration</value>- </data>- <data name="Description" xml:space="preserve">- <value>Calculate hash from text or binary data</value>- </data>- <data name="HashAlgorithmOptionDescription" xml:space="preserve">- <value>The type of hash to generate</value>- </data>- <data name="HashesMatch" xml:space="preserve">- <value>The hashes are the same</value>- </data>- <data name="HashesMismatch" xml:space="preserve">- <value>The hashes are different</value>- </data>- <data name="HashingAlgorithmDescription" xml:space="preserve">- <value>Select which hashing algorithm you want to use</value>- </data>- <data name="HashingAlgorithmTitle" xml:space="preserve">- <value>Hashing Algorithm</value>- </data>- <data name="HmacSecret" xml:space="preserve">- <value>Secret key to use to generate a HMAC hash</value>- </data>- <data name="HmacSecretOptionDescription" xml:space="preserve">- <value>Secret key to use to generate a HMAC hash</value>- </data>- <data name="InputOptionDescription" xml:space="preserve">- <value>Text or path to a file to hash</value>- </data>- <data name="InputTextTitle" xml:space="preserve">- <value>Input text</value>- </data>- <data name="InvalidInputOrFileCommand" xml:space="preserve">- <value>Please specify an input text or an input file</value>- </data>- <data name="LongDisplayTitle" xml:space="preserve">- <value>Hash / Checksum Generator</value>- </data>- <data name="Or" xml:space="preserve">- <value>or</value>- </data>- <data name="OutputTitle" xml:space="preserve">- <value>Output</value>- </data>- <data name="ShortDisplayTitle" xml:space="preserve">- <value>Hash / Checksum</value>- </data>- <data name="SilentOptionDescription" xml:space="preserve">- <value>Hides the progress of the hashing operation</value>- </data>- <data name="UppercaseOptionDescription" xml:space="preserve">- <value>Whether the generated hash should be in uppercase or not</value>- </data>- <data name="UppercaseTitle" xml:space="preserve">- <value>Uppercase</value>- </data>-</root>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/Generators/HashAndChecksum/HashAndChecksumGeneratorCommandLineTool.cs b/src/app/dev/DevToys.Tools/Tools/Generators/HashAndChecksum/HashAndChecksumGeneratorCommandLineTool.csdeleted file mode 100644index ed05ab1d4..000000000--- a/src/app/dev/DevToys.Tools/Tools/Generators/HashAndChecksum/HashAndChecksumGeneratorCommandLineTool.cs+++ /dev/null@@ -1,129 +0,0 @@-using System.Security.Authentication;-using DevToys.Tools.Helpers;-using Microsoft.Extensions.Logging;-using OneOf;--namespace DevToys.Tools.Tools.Generators.HashAndChecksum;--[Export(typeof(ICommandLineTool))]-[Name("HashAndChecksumGenerator")]-[CommandName(- Name = "checksum",- Alias = "hash",- ResourceManagerBaseName = "DevToys.Tools.Tools.Generators.HashAndChecksum.HashAndChecksumGenerator",- DescriptionResourceName = nameof(HashAndChecksumGenerator.Description))]-internal sealed class HashAndChecksumGeneratorCommandLineTool : ICommandLineTool-{-#pragma warning disable IDE0044 // Add readonly modifier- [Import]- private IFileStorage _fileStorage = null!;-#pragma warning restore IDE0044 // Add readonly modifier-- [CommandLineOption(- Name = "input",- Alias = "i",- IsRequired = true,- DescriptionResourceName = nameof(HashAndChecksumGenerator.InputOptionDescription))]- internal OneOf<string, FileInfo>? Input { get; set; }-- [CommandLineOption(- Name = "algorithm",- Alias = "a",- DescriptionResourceName = nameof(HashAndChecksumGenerator.HashAlgorithmOptionDescription))]- internal HashAlgorithmType HashAlgorithm { get; set; } = HashAlgorithmType.Md5;-- [CommandLineOption(- Name = "uppercase",- Alias = "u",- DescriptionResourceName = nameof(HashAndChecksumGenerator.UppercaseOptionDescription))]- internal bool Uppercase { get; set; } = false;-- [CommandLineOption(- Name = "hmac",- Alias = "m",- DescriptionResourceName = nameof(HashAndChecksumGenerator.HmacSecretOptionDescription))]- internal string? HmacSecretKey { get; set; }-- [CommandLineOption(- Name = "checksum",- Alias = "c",- DescriptionResourceName = nameof(HashAndChecksumGenerator.ChecksumVerificationOptionDescription))]- internal OneOf<FileInfo, string>? ChecksumVerification { get; set; }-- [CommandLineOption(- Name = "silent",- Alias = "s",- DescriptionResourceName = nameof(HashAndChecksumGenerator.SilentOptionDescription))]- internal bool Silent { get; set; } = false;-- public async ValueTask<int> InvokeAsync(ILogger logger, CancellationToken cancellationToken)- {- if (!Input.HasValue || HashAlgorithm == HashAlgorithmType.None)- {- return -1;- }-- try- {- ResultInfo<Stream> streamResult = await Input.Value.GetStreamAsync(_fileStorage, cancellationToken);- using Stream inputStream = streamResult.Data!;-- if (inputStream == null || inputStream == Stream.Null)- {- Console.Error.WriteLine(HashAndChecksumGenerator.InvalidInputOrFileCommand);- return -1;- }-- string? fileHashString = null;- ConsoleProgressBar? progressBar = Silent ? null : new ConsoleProgressBar();- using (progressBar)- {- fileHashString- = await HashingHelper.ComputeHashAsync(- HashAlgorithm,- inputStream,- HmacSecretKey,- hashProgress =>- {- progressBar?.Report(hashProgress.GetPercentage());- },- cancellationToken);- }-- if (ChecksumVerification.HasValue)- {- ResultInfo<string> checksum = await ChecksumVerification.Value.ReadAllTextAsync(_fileStorage, cancellationToken);- if (checksum.HasSucceeded && string.Equals(checksum.Data, fileHashString, StringComparison.OrdinalIgnoreCase))- {- Console.WriteLine(HashAndChecksumGenerator.ChecksumVerificationSucceeded);- return 0;- }- else- {- Console.WriteLine(HashAndChecksumGenerator.ChecksumVerificationFailed);- return -1;- }- }-- if (!Uppercase)- {- Console.WriteLine(fileHashString.ToLowerInvariant());- }- else- {- Console.WriteLine(fileHashString);- }-- return 0;- }- catch (Exception ex) when (ex is TaskCanceledException or OperationCanceledException)- {- return -1;- }- catch- {- // TODO: Log exception.- return -1;- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Generators/HashAndChecksum/HashAndChecksumGeneratorGuiTool.cs b/src/app/dev/DevToys.Tools/Tools/Generators/HashAndChecksum/HashAndChecksumGeneratorGuiTool.csdeleted file mode 100644index df2be30f1..000000000--- a/src/app/dev/DevToys.Tools/Tools/Generators/HashAndChecksum/HashAndChecksumGeneratorGuiTool.cs+++ /dev/null@@ -1,405 +0,0 @@-using System.Security.Authentication;-using System.Security.Cryptography;-using DevToys.Tools.Helpers;-using DevToys.Tools.Models;-using Microsoft.Extensions.Logging;-using OneOf;--namespace DevToys.Tools.Tools.Generators.HashAndChecksum;--[Export(typeof(IGuiTool))]-[Name("HashAndChecksumGenerator")]-[ToolDisplayInformation(- IconFontName = "DevToys-Tools-Icons",- IconGlyph = '\u0125',- GroupName = PredefinedCommonToolGroupNames.Generators,- ResourceManagerAssemblyIdentifier = nameof(DevToysToolsResourceManagerAssemblyIdentifier),- ResourceManagerBaseName = "DevToys.Tools.Tools.Generators.HashAndChecksum.HashAndChecksumGenerator",- ShortDisplayTitleResourceName = nameof(HashAndChecksumGenerator.ShortDisplayTitle),- LongDisplayTitleResourceName = nameof(HashAndChecksumGenerator.LongDisplayTitle),- DescriptionResourceName = nameof(HashAndChecksumGenerator.Description),- AccessibleNameResourceName = nameof(HashAndChecksumGenerator.AccessibleName))]-[AcceptedDataTypeName(PredefinedCommonDataTypeNames.Text)]-[AcceptedDataTypeName(PredefinedCommonDataTypeNames.File)]-internal sealed class HashAndChecksumGeneratorGuiTool : IGuiTool, IDisposable-{- /// <summary>- /// Whether the generated hash should be uppercase or lowercase.- /// </summary>- private static readonly SettingDefinition<bool> uppercase- = new(- name: $"{nameof(HashAndChecksumGeneratorGuiTool)}.{nameof(uppercase)}",- defaultValue: false);-- /// <summary>- /// The hashing algorithm to use.- /// </summary>- private static readonly SettingDefinition<HashAlgorithmType> hashAlgorithm- = new(- name: $"{nameof(HashAndChecksumGeneratorGuiTool)}.{nameof(hashAlgorithm)}",- defaultValue: HashAlgorithmType.Md5);-- private enum GridRows- {- Stretch- }-- private enum GridColumns- {- Left,- Center,- Right- }-- private readonly DisposableSemaphore _semaphore = new();- private readonly ILogger _logger;- private readonly ISettingsProvider _settingsProvider;- private readonly IUIStack _progressStack = Stack();- private readonly IUIProgressBar _progressBar = ProgressBar();- private readonly IUISingleLineTextInput _hmacSecretKeyInput = SingleLineTextInput("hash-checksum-generator-hmac-secret-key");- private readonly IUIMultiLineTextInput _inputText = MultilineTextInput("hash-checksum-generator-input-text");- private readonly IUIFileSelector _fileSelector = FileSelector("hash-checksum-generator-input-file");- private readonly IUISingleLineTextInput _output = SingleLineTextInput("hash-checksum-generator-output");- private readonly IUISingleLineTextInput _checksumVerification = SingleLineTextInput("hash-checksum-generator-checksum-verification");- private readonly IUIInfoBar _infoBar = InfoBar("hash-checksum-generator-output-comparer-result");-- private CancellationTokenSource? _cancellationTokenSource;- private OneOf<string, SandboxedFileReader>? _input;- private bool _ignoreInputTextChange;- private DateTime _lastStartTime;-- [ImportingConstructor]- public HashAndChecksumGeneratorGuiTool(ISettingsProvider settingsProvider)- {- _logger = this.Log();- _settingsProvider = settingsProvider;- }-- // For unit tests.- internal Task? WorkTask { get; private set; }-- public UIToolView View- => new(- isScrollable: true,- Stack()- .Vertical()- .LargeSpacing()-- .WithChildren(- Stack()- .Vertical()- .SmallSpacing()-- .WithChildren(- Label()- .Text(HashAndChecksumGenerator.ConfigurationTitle),-- SettingGroup("hash-checksum-generator-hash-algorithm-setting")- .Icon("FluentSystemIcons", '\uF1EE')- .Title(HashAndChecksumGenerator.HashingAlgorithmTitle)- .Description(HashAndChecksumGenerator.HashingAlgorithmDescription)-- .Handle(- _settingsProvider,- hashAlgorithm,- onOptionSelected: OnHashingAlgorithmChanged,- Item(HashAlgorithmName.MD5.Name, HashAlgorithmType.Md5),- Item(HashAlgorithmName.SHA1.Name, HashAlgorithmType.Sha1),- Item(HashAlgorithmName.SHA256.Name, HashAlgorithmType.Sha256),- Item(HashAlgorithmName.SHA384.Name, HashAlgorithmType.Sha384),- Item(HashAlgorithmName.SHA512.Name, HashAlgorithmType.Sha512))-- .WithChildren(- Setting("hash-checksum-generator-uppercase-setting")- .Title(HashAndChecksumGenerator.UppercaseTitle)- .Handle(_settingsProvider, uppercase, OnUppercaseChanged),-- _hmacSecretKeyInput- .Title(HashAndChecksumGenerator.HmacSecret)- .OnTextChanged(OnHmacSecretKeyChanged))),-- Grid()- .ColumnMediumSpacing()-- .Rows(- (GridRows.Stretch, new UIGridLength(1, UIGridUnitType.Fraction)))-- .Columns(- (GridColumns.Left, new UIGridLength(1, UIGridUnitType.Fraction)),- (GridColumns.Center, Auto),- (GridColumns.Right, new UIGridLength(1, UIGridUnitType.Fraction)))-- .Cells(- Cell(- GridRows.Stretch,- GridColumns.Left,-- _inputText- .Title(HashAndChecksumGenerator.InputTextTitle)- .OnTextChanged(OnInputTextChanged)),-- Cell(- GridRows.Stretch,- GridColumns.Center,-- Label()- .Text(HashAndChecksumGenerator.Or)- .AlignVertically(UIVerticalAlignment.Center)),-- Cell(- GridRows.Stretch,- GridColumns.Right,-- _fileSelector- .CanSelectOneFile()- .OnFilesSelected(OnInputFileChanged))),-- _progressStack- .AlignHorizontally(UIHorizontalAlignment.Center)- .Horizontal()- .SmallSpacing()- .Hide()-- .WithChildren(- _progressBar,- Button()- .Icon("FluentSystemIcons", '\uF75A')- .OnClick(OnCancelButtonClicked)),-- _output- .Title(HashAndChecksumGenerator.OutputTitle)- .ReadOnly()- .OnTextChanged(OnOutputOrOutputComparerTextChanged),-- _checksumVerification- .Title(HashAndChecksumGenerator.ChecksumVerificationTitle)- .OnTextChanged(OnOutputOrOutputComparerTextChanged),-- _infoBar.NonClosable()));-- public void OnDataReceived(string dataTypeName, object? parsedData)- {- if (dataTypeName == PredefinedCommonDataTypeNames.Text && parsedData is string text)- {- _inputText.Text(text); // This will trigger a hash generation.- }- else if (dataTypeName == PredefinedCommonDataTypeNames.File && parsedData is FileInfo fileInfo)- {- _fileSelector.WithFiles(SandboxedFileReader.FromFileInfo(fileInfo)); // This will trigger a hash generation.- }- }-- public void Dispose()- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _semaphore.Dispose();- }-- private void OnOutputOrOutputComparerTextChanged(string text)- {- if (!string.IsNullOrEmpty(_output.Text) && !string.IsNullOrEmpty(_checksumVerification.Text))- {- if (string.Equals(_output.Text, _checksumVerification.Text, StringComparison.OrdinalIgnoreCase))- {- _infoBar.Title(HashAndChecksumGenerator.HashesMatch).Success();- }- else- {- _infoBar.Title(HashAndChecksumGenerator.HashesMismatch).Error();- }-- _infoBar.Open();- }- else- {- _infoBar.Close();- }- }-- private void OnUppercaseChanged(bool isUppercase)- {- if (isUppercase)- {- _output.Text(_output.Text.ToUpperInvariant());- }- else- {- _output.Text(_output.Text.ToLowerInvariant());- }- }-- private void OnHashingAlgorithmChanged(HashAlgorithmType hashAlgorithm)- {- StartComputeHash();- }-- private void OnHmacSecretKeyChanged(string secretKey)- {- StartComputeHash();- }-- private void OnInputTextChanged(string text)- {- if (!_ignoreInputTextChange)- {- if (_input.HasValue && _input.Value.TryPickT1(out SandboxedFileReader file, out _))- {- file.Dispose();- }-- _input = text;-- StartComputeHash();- }- }-- private void OnInputFileChanged(SandboxedFileReader[] sandboxedFileReader)- {- if (_input.HasValue && _input.Value.TryPickT1(out SandboxedFileReader file, out _))- {- file.Dispose();- }-- Guard.HasSizeEqualTo(sandboxedFileReader, 1);- _input = sandboxedFileReader[0];-- _ignoreInputTextChange = true;- _inputText.Text(string.Empty);- _ignoreInputTextChange = false;-- StartComputeHash();- }-- private void OnCancelButtonClicked()- {- _cancellationTokenSource?.Cancel();- _progressStack.Hide();- }-- private void StartComputeHash()- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _cancellationTokenSource = new CancellationTokenSource();- _lastStartTime = DateTime.UtcNow;-- if (_input.HasValue)- {- WorkTask- = ComputeHashAsync(- _input.Value,- _settingsProvider.GetSetting(hashAlgorithm),- _settingsProvider.GetSetting(uppercase),- _hmacSecretKeyInput.Text,- _cancellationTokenSource.Token);- }- else- {- WorkTask = Task.CompletedTask;- }- }-- private async Task ComputeHashAsync(- OneOf<string, SandboxedFileReader> input,- HashAlgorithmType hashAlgorithm,- bool uppercase,- string hmacSecretKey,- CancellationToken cancellationToken)- {- try- {- using (await _semaphore.WaitAsync(cancellationToken))- {- _output.Text(string.Empty);- _progressBar.Progress(0);-- await TaskSchedulerAwaiter.SwitchOffMainThreadAsync(cancellationToken);-- Stream? inputStream- = await input.Match(- async inputString =>- {- var stringStream = new MemoryStream();- var writer = new StreamWriter(stringStream);- if (inputString is not null)- {- await writer.WriteAsync(inputString.AsMemory(), cancellationToken);- }- writer.Flush();- stringStream.Position = 0;- return (Stream)stringStream;- },- inputFile => inputFile.GetNewAccessToFileContentAsync(cancellationToken));-- Guard.IsNotNull(inputStream);- string hash- = await ComputeHashFromStreamAsync(- inputStream,- hashAlgorithm,- uppercase,- hmacSecretKey,- UpdateProgress,- cancellationToken);-- cancellationToken.ThrowIfCancellationRequested();-- _output.Text(hash);- }- }- finally- {- _progressStack.Hide();- }- }-- private static async Task<string> ComputeHashFromStreamAsync(- Stream inputStream,- HashAlgorithmType hashAlgorithm,- bool uppercase,- string hmacSecretKey,- Action<HashingProgress> progressCallback,- CancellationToken cancellationToken)- {- try- {- string fileHashString- = await HashingHelper.ComputeHashAsync(- hashAlgorithm,- inputStream,- hmacSecretKey,- progressCallback,- cancellationToken);-- if (!uppercase)- {- return fileHashString.ToLowerInvariant();- }-- return fileHashString;- }- catch (OperationCanceledException)- {- return string.Empty;- }- catch (Exception ex)- {- // Logger.LogFault("Checksum Generator", ex, $"Failed to calculate FileHash, algorithm used: {inputHashingAlgorithm}");- return ex.Message;- }- }-- private void UpdateProgress(HashingProgress hashingProgress)- {- if (!hashingProgress.CancellationToken.IsCancellationRequested)- {- if (DateTime.UtcNow - _lastStartTime > TimeSpan.FromMilliseconds(250))- {- // Show progress bar only if the operation takes more than 250ms.- // This avoids having the progress bar flickering as the user type the HMAC secret key or type in the text input form.- _progressStack.Show();- }- _progressBar.ProgressAsync(hashingProgress.GetPercentage()).Forget();- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Generators/LoremIpsum/LoremIpsumGenerator.Designer.cs b/src/app/dev/DevToys.Tools/Tools/Generators/LoremIpsum/LoremIpsumGenerator.Designer.csdeleted file mode 100644index ef70badb9..000000000--- a/src/app/dev/DevToys.Tools/Tools/Generators/LoremIpsum/LoremIpsumGenerator.Designer.cs+++ /dev/null@@ -1,333 +0,0 @@-//-------------------------------------------------------------------------------// <auto-generated>-// This code was generated by a tool.-// Runtime Version:4.0.30319.42000-//-// Changes to this file may cause incorrect behavior and will be lost if-// the code is regenerated.-// </auto-generated>-//--------------------------------------------------------------------------------namespace DevToys.Tools.Tools.Generators.LoremIpsum {- using System;--- /// <summary>- /// A strongly-typed resource class, for looking up localized strings, etc.- /// </summary>- // This class was auto-generated by the StronglyTypedResourceBuilder- // class via a tool like ResGen or Visual Studio.- // To add or remove a member, edit your .ResX file then rerun ResGen- // with the /str option, or rebuild your VS project.- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]- internal class LoremIpsumGenerator {-- private static global::System.Resources.ResourceManager resourceMan;-- private static global::System.Globalization.CultureInfo resourceCulture;-- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]- internal LoremIpsumGenerator() {- }-- /// <summary>- /// Returns the cached ResourceManager instance used by this class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Resources.ResourceManager ResourceManager {- get {- if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Tools.Tools.Generators.LoremIpsum.LoremIpsumGenerator", typeof(LoremIpsumGenerator).Assembly);- resourceMan = temp;- }- return resourceMan;- }- }-- /// <summary>- /// Overrides the current thread's CurrentUICulture property for all- /// resource lookups using this strongly typed resource class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Globalization.CultureInfo Culture {- get {- return resourceCulture;- }- set {- resourceCulture = value;- }- }-- /// <summary>- /// Looks up a localized string similar to Lorem Ipsum Generator tool.- /// </summary>- internal static string AccessibleName {- get {- return ResourceManager.GetString("AccessibleName", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Configuration.- /// </summary>- internal static string ConfigurationTitle {- get {- return ResourceManager.GetString("ConfigurationTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Text corpus to use.- /// </summary>- internal static string CorpusOptionDescription {- get {- return ResourceManager.GetString("CorpusOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Generate Lorem Ipsum (or similar) placeholder text.- /// </summary>- internal static string Description {- get {- return ResourceManager.GetString("Description", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Number of words, sentences or paragraphs to generate.- /// </summary>- internal static string LengthDescription {- get {- return ResourceManager.GetString("LengthDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Number of words, sentences or paragraphs to generate.- /// </summary>- internal static string LengthOptionDescription {- get {- return ResourceManager.GetString("LengthOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Length.- /// </summary>- internal static string LengthTitle {- get {- return ResourceManager.GetString("LengthTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Childe Harold's Pilgrimage (Lord Byron).- /// </summary>- internal static string LipsumChildHarold {- get {- return ResourceManager.GetString("LipsumChildHarold", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Decameron - Novella Prima (Giovanni Boccaccio).- /// </summary>- internal static string LipsumDecameron {- get {- return ResourceManager.GetString("LipsumDecameron", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Faust (Goethe), German.- /// </summary>- internal static string LipsumFaust {- get {- return ResourceManager.GetString("LipsumFaust", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to In der Fremde (Heinrich Heine), German.- /// </summary>- internal static string LipsumInDerFremde {- get {- return ResourceManager.GetString("LipsumInDerFremde", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Le Bateau Ivre (Arthur Rimbaud), French.- /// </summary>- internal static string LipsumLeBateauIvre {- get {- return ResourceManager.GetString("LipsumLeBateauIvre", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Le Masque (Charles Baudelaire), French.- /// </summary>- internal static string LipsumLeMasque {- get {- return ResourceManager.GetString("LipsumLeMasque", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Lorem Ipsum (Marcus Tullius Cicero), Latin.- /// </summary>- internal static string LipsumLoremIpsum {- get {- return ResourceManager.GetString("LipsumLoremIpsum", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Nagyon fáj (József Attila), Hungarian.- /// </summary>- internal static string LipsumNagyonFaj {- get {- return ResourceManager.GetString("LipsumNagyonFaj", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Ómagyar-Mária siralom (Ismeretlen), Hungarian.- /// </summary>- internal static string LipsumOmagyar {- get {- return ResourceManager.GetString("LipsumOmagyar", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Robinsono Kruso (Daniel Defoe), Esperanto.- /// </summary>- internal static string LipsumRobinsonoKruso {- get {- return ResourceManager.GetString("LipsumRobinsonoKruso", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The Raven (Edward Allen Poe), English.- /// </summary>- internal static string LipsumTheRaven {- get {- return ResourceManager.GetString("LipsumTheRaven", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Tierra y Luna (Federico García Lorca), Spanish.- /// </summary>- internal static string LipsumTierrayLuna {- get {- return ResourceManager.GetString("LipsumTierrayLuna", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Text corpus.- /// </summary>- internal static string LipsumTitle {- get {- return ResourceManager.GetString("LipsumTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Lorem Ipsum Generator.- /// </summary>- internal static string LongDisplayTitle {- get {- return ResourceManager.GetString("LongDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Output.- /// </summary>- internal static string Output {- get {- return ResourceManager.GetString("Output", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Paragraphs.- /// </summary>- internal static string ParagraphsType {- get {- return ResourceManager.GetString("ParagraphsType", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Refresh.- /// </summary>- internal static string Refresh {- get {- return ResourceManager.GetString("Refresh", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Sentences.- /// </summary>- internal static string SentencesType {- get {- return ResourceManager.GetString("SentencesType", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Lorem Ipsum.- /// </summary>- internal static string ShortDisplayTitle {- get {- return ResourceManager.GetString("ShortDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Generate words, sentences or paragraphs of Lorem Ipsum.- /// </summary>- internal static string TypeDescription {- get {- return ResourceManager.GetString("TypeDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Whether words, sentences or paragraphs should be generated.- /// </summary>- internal static string TypeOptionDescription {- get {- return ResourceManager.GetString("TypeOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Type.- /// </summary>- internal static string TypeTitle {- get {- return ResourceManager.GetString("TypeTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Words.- /// </summary>- internal static string WordsType {- get {- return ResourceManager.GetString("WordsType", resourceCulture);- }- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Generators/LoremIpsum/LoremIpsumGenerator.resx b/src/app/dev/DevToys.Tools/Tools/Generators/LoremIpsum/LoremIpsumGenerator.resxdeleted file mode 100644index 64c33814e..000000000--- a/src/app/dev/DevToys.Tools/Tools/Generators/LoremIpsum/LoremIpsumGenerator.resx+++ /dev/null@@ -1,210 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<root>- <!--- Microsoft ResX Schema-- Version 2.0-- The primary goals of this format is to allow a simple XML format- that is mostly human readable. The generation and parsing of the- various data types are done through the TypeConverter classes- associated with the data types.-- Example:-- ... ado.net/XML headers & schema ...- <resheader name="resmimetype">text/microsoft-resx</resheader>- <resheader name="version">2.0</resheader>- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">- <value>[base64 mime encoded serialized .NET Framework object]</value>- </data>- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>- <comment>This is a comment</comment>- </data>-- There are any number of "resheader" rows that contain simple- name/value pairs.-- Each data row contains a name, and value. The row also contains a- type or mimetype. Type corresponds to a .NET class that support- text/value conversion through the TypeConverter architecture.- Classes that don't support this are serialized and stored with the- mimetype set.-- The mimetype is used for serialized objects, and tells the- ResXResourceReader how to depersist the object. This is currently not- extensible. For a given mimetype the value must be set accordingly:-- Note - application/x-microsoft.net.object.binary.base64 is the format- that the ResXResourceWriter will generate, however the reader can- read any of the formats listed below.-- mimetype: application/x-microsoft.net.object.binary.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.soap.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.bytearray.base64- value : The object must be serialized into a byte array- : using a System.ComponentModel.TypeConverter- : and then encoded with base64 encoding.- -->- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />- <xsd:element name="root" msdata:IsDataSet="true">- <xsd:complexType>- <xsd:choice maxOccurs="unbounded">- <xsd:element name="metadata">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" />- </xsd:sequence>- <xsd:attribute name="name" use="required" type="xsd:string" />- <xsd:attribute name="type" type="xsd:string" />- <xsd:attribute name="mimetype" type="xsd:string" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="assembly">- <xsd:complexType>- <xsd:attribute name="alias" type="xsd:string" />- <xsd:attribute name="name" type="xsd:string" />- </xsd:complexType>- </xsd:element>- <xsd:element name="data">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="resheader">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" />- </xsd:complexType>- </xsd:element>- </xsd:choice>- </xsd:complexType>- </xsd:element>- </xsd:schema>- <resheader name="resmimetype">- <value>text/microsoft-resx</value>- </resheader>- <resheader name="version">- <value>2.0</value>- </resheader>- <resheader name="reader">- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <resheader name="writer">- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <data name="AccessibleName" xml:space="preserve">- <value>Lorem Ipsum Generator tool</value>- </data>- <data name="ConfigurationTitle" xml:space="preserve">- <value>Configuration</value>- </data>- <data name="CorpusOptionDescription" xml:space="preserve">- <value>Text corpus to use</value>- </data>- <data name="Description" xml:space="preserve">- <value>Generate Lorem Ipsum (or similar) placeholder text</value>- </data>- <data name="LengthDescription" xml:space="preserve">- <value>Number of words, sentences or paragraphs to generate</value>- </data>- <data name="LengthOptionDescription" xml:space="preserve">- <value>Number of words, sentences or paragraphs to generate</value>- </data>- <data name="LengthTitle" xml:space="preserve">- <value>Length</value>- </data>- <data name="LipsumChildHarold" xml:space="preserve">- <value>Childe Harold's Pilgrimage (Lord Byron)</value>- </data>- <data name="LipsumDecameron" xml:space="preserve">- <value>Decameron - Novella Prima (Giovanni Boccaccio)</value>- </data>- <data name="LipsumFaust" xml:space="preserve">- <value>Faust (Goethe), German</value>- </data>- <data name="LipsumInDerFremde" xml:space="preserve">- <value>In der Fremde (Heinrich Heine), German</value>- </data>- <data name="LipsumLeBateauIvre" xml:space="preserve">- <value>Le Bateau Ivre (Arthur Rimbaud), French</value>- </data>- <data name="LipsumLeMasque" xml:space="preserve">- <value>Le Masque (Charles Baudelaire), French</value>- </data>- <data name="LipsumLoremIpsum" xml:space="preserve">- <value>Lorem Ipsum (Marcus Tullius Cicero), Latin</value>- </data>- <data name="LipsumNagyonFaj" xml:space="preserve">- <value>Nagyon fáj (József Attila), Hungarian</value>- </data>- <data name="LipsumOmagyar" xml:space="preserve">- <value>Ómagyar-Mária siralom (Ismeretlen), Hungarian</value>- </data>- <data name="LipsumRobinsonoKruso" xml:space="preserve">- <value>Robinsono Kruso (Daniel Defoe), Esperanto</value>- </data>- <data name="LipsumTheRaven" xml:space="preserve">- <value>The Raven (Edward Allen Poe), English</value>- </data>- <data name="LipsumTierrayLuna" xml:space="preserve">- <value>Tierra y Luna (Federico García Lorca), Spanish</value>- </data>- <data name="LipsumTitle" xml:space="preserve">- <value>Text corpus</value>- </data>- <data name="LongDisplayTitle" xml:space="preserve">- <value>Lorem Ipsum Generator</value>- </data>- <data name="Output" xml:space="preserve">- <value>Output</value>- </data>- <data name="ParagraphsType" xml:space="preserve">- <value>Paragraphs</value>- </data>- <data name="Refresh" xml:space="preserve">- <value>Refresh</value>- </data>- <data name="SentencesType" xml:space="preserve">- <value>Sentences</value>- </data>- <data name="ShortDisplayTitle" xml:space="preserve">- <value>Lorem Ipsum</value>- </data>- <data name="TypeDescription" xml:space="preserve">- <value>Generate words, sentences or paragraphs of Lorem Ipsum</value>- </data>- <data name="TypeOptionDescription" xml:space="preserve">- <value>Whether words, sentences or paragraphs should be generated</value>- </data>- <data name="TypeTitle" xml:space="preserve">- <value>Type</value>- </data>- <data name="WordsType" xml:space="preserve">- <value>Words</value>- </data>-</root>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/Generators/LoremIpsum/LoremIpsumGeneratorCommandLineTool.cs b/src/app/dev/DevToys.Tools/Tools/Generators/LoremIpsum/LoremIpsumGeneratorCommandLineTool.csdeleted file mode 100644index 0d5690109..000000000--- a/src/app/dev/DevToys.Tools/Tools/Generators/LoremIpsum/LoremIpsumGeneratorCommandLineTool.cs+++ /dev/null@@ -1,46 +0,0 @@-using DevToys.Tools.Helpers.LoremIpsum;-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.Tools.Generators.LoremIpsum;--[Export(typeof(ICommandLineTool))]-[Name(internalComponentName: "LoremIpsumGenerator")]-[CommandName(- Name = "loremipsum",- Alias = "li",- ResourceManagerBaseName = "DevToys.Tools.Tools.Generators.LoremIpsum.LoremIpsumGenerator",- DescriptionResourceName = nameof(LoremIpsumGenerator.Description))]-internal sealed class LoremIpsumGeneratorCommandLineTool : ICommandLineTool-{- [CommandLineOption(- Name = "corpus",- Alias = "c",- DescriptionResourceName = nameof(LoremIpsumGenerator.CorpusOptionDescription))]- internal LipsumsCorpus Corpus { get; set; } = LipsumsCorpus.LoremIpsum;-- [CommandLineOption(- Name = "type",- Alias = "t",- DescriptionResourceName = nameof(LoremIpsumGenerator.TypeOptionDescription))]- internal Features Type { get; set; } = Features.Paragraphs;-- [CommandLineOption(- Name = "length",- Alias = "l",- DescriptionResourceName = nameof(LoremIpsumGenerator.LengthOptionDescription))]- internal int Length { get; set; } = 1;-- public ValueTask<int> InvokeAsync(ILogger logger, CancellationToken cancellationToken)- {- if (Length <= 0)- {- return ValueTask.FromResult(-1);- }-- var generator = new LipsumGenerator(Corpus);- string generatedText = generator.GenerateLipsum(Length, Type);-- Console.WriteLine(generatedText);- return ValueTask.FromResult(0);- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Generators/LoremIpsum/LoremIpsumGeneratorGuiTool.cs b/src/app/dev/DevToys.Tools/Tools/Generators/LoremIpsum/LoremIpsumGeneratorGuiTool.csdeleted file mode 100644index b67a398cb..000000000--- a/src/app/dev/DevToys.Tools/Tools/Generators/LoremIpsum/LoremIpsumGeneratorGuiTool.cs+++ /dev/null@@ -1,194 +0,0 @@-using System.Globalization;-using System.Reflection.Emit;-using DevToys.Api;-using DevToys.Tools.Helpers.LoremIpsum;-using DevToys.Tools.Models;-using DevToys.Tools.Tools.Generators.UUID;--namespace DevToys.Tools.Tools.Generators.LoremIpsum;--[Export(typeof(IGuiTool))]-[Name("LoremIpsumGenerator")]-[ToolDisplayInformation(- IconFontName = "DevToys-Tools-Icons",- IconGlyph = '\u0111',- GroupName = PredefinedCommonToolGroupNames.Generators,- ResourceManagerAssemblyIdentifier = nameof(DevToysToolsResourceManagerAssemblyIdentifier),- ResourceManagerBaseName = "DevToys.Tools.Tools.Generators.LoremIpsum.LoremIpsumGenerator",- ShortDisplayTitleResourceName = nameof(LoremIpsumGenerator.ShortDisplayTitle),- LongDisplayTitleResourceName = nameof(LoremIpsumGenerator.LongDisplayTitle),- DescriptionResourceName = nameof(LoremIpsumGenerator.Description),- AccessibleNameResourceName = nameof(LoremIpsumGenerator.AccessibleName))]-internal sealed class LoremIpsumGeneratorGuiTool : IGuiTool-{- /// <summary>- /// The type of lipsum to generate.- /// </summary>- private static readonly SettingDefinition<LipsumsCorpus> lipsum- = new(- name: $"{nameof(LoremIpsumGeneratorGuiTool)}.{nameof(lipsum)}",- defaultValue: LipsumsCorpus.LoremIpsum);-- /// <summary>- /// Whether a word, sentence, or paragraph should be generated.- /// </summary>- private static readonly SettingDefinition<Features> type- = new(- name: $"{nameof(LoremIpsumGeneratorGuiTool)}.{nameof(type)}",- defaultValue: Features.Paragraphs);-- /// <summary>- /// The amount of words, sentences, or paragraphs to generate.- /// </summary>- private static readonly SettingDefinition<int> length- = new(- name: $"{nameof(LoremIpsumGeneratorGuiTool)}.{nameof(length)}",- defaultValue: 1);-- private enum GridColumn- {- Stretch- }-- private enum GridRow- {- Settings,- Results- }-- private readonly ISettingsProvider _settingsProvider;- private readonly IUIMultiLineTextInput _outputText = MultilineTextInput();-- private LipsumGenerator _generator;-- [ImportingConstructor]- public LoremIpsumGeneratorGuiTool(ISettingsProvider settingsProvider)- {- _settingsProvider = settingsProvider;- _generator = new LipsumGenerator(_settingsProvider.GetSetting(lipsum));-- OnGenerateButtonClick();- }-- public UIToolView View- => new(- isScrollable: true,- Grid()- .ColumnLargeSpacing()- .RowLargeSpacing()- .Rows(- (GridRow.Settings, Auto),- (GridRow.Results, new UIGridLength(1, UIGridUnitType.Fraction)))- .Columns(- (GridColumn.Stretch, new UIGridLength(1, UIGridUnitType.Fraction)))-- .Cells(- Cell(- GridRow.Settings,- GridColumn.Stretch,- Stack()- .Vertical()- .LargeSpacing()- .WithChildren(-- Stack()- .Vertical()- .WithChildren(-- Label().Text(LoremIpsumGenerator.ConfigurationTitle),-- Setting()- .Icon("FluentSystemIcons", '\uE178')- .Title(LoremIpsumGenerator.LipsumTitle)- .Handle(- _settingsProvider,- lipsum,- OnSettingChanged,- Item(LoremIpsumGenerator.LipsumChildHarold, LipsumsCorpus.ChildHarold),- Item(LoremIpsumGenerator.LipsumDecameron, LipsumsCorpus.Decameron),- Item(LoremIpsumGenerator.LipsumFaust, LipsumsCorpus.Faust),- Item(LoremIpsumGenerator.LipsumInDerFremde, LipsumsCorpus.InDerFremde),- Item(LoremIpsumGenerator.LipsumLeBateauIvre, LipsumsCorpus.LeBateauIvre),- Item(LoremIpsumGenerator.LipsumLeMasque, LipsumsCorpus.LeMasque),- Item(LoremIpsumGenerator.LipsumLoremIpsum, LipsumsCorpus.LoremIpsum),- Item(LoremIpsumGenerator.LipsumNagyonFaj, LipsumsCorpus.NagyonFaj),- Item(LoremIpsumGenerator.LipsumOmagyar, LipsumsCorpus.Omagyar),- Item(LoremIpsumGenerator.LipsumRobinsonoKruso, LipsumsCorpus.RobinsonoKruso),- Item(LoremIpsumGenerator.LipsumTheRaven, LipsumsCorpus.TheRaven),- Item(LoremIpsumGenerator.LipsumTierrayLuna, LipsumsCorpus.TierrayLuna)),-- Setting()- .Icon("FluentSystemIcons", '\uEB28')- .Title(LoremIpsumGenerator.TypeTitle)- .Description(LoremIpsumGenerator.TypeDescription)- .Handle(- _settingsProvider,- type,- OnSettingChanged,- Item(LoremIpsumGenerator.WordsType, Features.Words),- Item(LoremIpsumGenerator.SentencesType, Features.Sentences),- Item(LoremIpsumGenerator.ParagraphsType, Features.Paragraphs)),-- Setting()- .Icon("FluentSystemIcons", '\uF57D')- .Title(LoremIpsumGenerator.LengthTitle)- .Description(LoremIpsumGenerator.LengthDescription)- .InteractiveElement(- NumberInput()- .HideCommandBar()- .Minimum(1)- .OnValueChanged(OnLengthChanged)- .Value(_settingsProvider.GetSetting(length)))))),-- Cell(- GridRow.Results,- GridColumn.Stretch,-- _outputText- .Title(LoremIpsumGenerator.Output)- .ReadOnly()- .AlwaysWrap()- .CommandBarExtraContent(- Button()- .Icon("FluentSystemIcons", '\uF13D')- .Text(LoremIpsumGenerator.Refresh)- .OnClick(OnGenerateButtonClick)))));-- public void OnDataReceived(string dataTypeName, object? parsedData)- {- }-- private void OnSettingChanged(LipsumsCorpus value)- {- _generator = new LipsumGenerator(value);- OnGenerateButtonClick();- }-- private void OnSettingChanged(Features value)- {- OnGenerateButtonClick();- }-- private void OnLengthChanged(double value)- {- _settingsProvider.SetSetting(length, (int)value);- OnGenerateButtonClick();- }-- private void OnGenerateButtonClick()- {- int length = _settingsProvider.GetSetting(LoremIpsumGeneratorGuiTool.length);- if (length <= 0)- {- _outputText.Text(string.Empty);- return;- }-- Features type = _settingsProvider.GetSetting(LoremIpsumGeneratorGuiTool.type);-- Guard.IsNotNull(_generator);- string output = _generator.GenerateLipsum(length, type);-- _outputText.Text(output);- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Generators/Password/PasswordGenerator.Designer.cs b/src/app/dev/DevToys.Tools/Tools/Generators/Password/PasswordGenerator.Designer.csdeleted file mode 100644index 515212b5d..000000000--- a/src/app/dev/DevToys.Tools/Tools/Generators/Password/PasswordGenerator.Designer.cs+++ /dev/null@@ -1,369 +0,0 @@-//-------------------------------------------------------------------------------// <auto-generated>-// This code was generated by a tool.-// Runtime Version:4.0.30319.42000-//-// Changes to this file may cause incorrect behavior and will be lost if-// the code is regenerated.-// </auto-generated>-//--------------------------------------------------------------------------------namespace DevToys.Tools.Tools.Generators.Password {- using System;--- /// <summary>- /// A strongly-typed resource class, for looking up localized strings, etc.- /// </summary>- // This class was auto-generated by the StronglyTypedResourceBuilder- // class via a tool like ResGen or Visual Studio.- // To add or remove a member, edit your .ResX file then rerun ResGen- // with the /str option, or rebuild your VS project.- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]- internal class PasswordGenerator {-- private static global::System.Resources.ResourceManager resourceMan;-- private static global::System.Globalization.CultureInfo resourceCulture;-- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]- internal PasswordGenerator() {- }-- /// <summary>- /// Returns the cached ResourceManager instance used by this class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Resources.ResourceManager ResourceManager {- get {- if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Tools.Tools.Generators.Password.PasswordGenerator", typeof(PasswordGenerator).Assembly);- resourceMan = temp;- }- return resourceMan;- }- }-- /// <summary>- /// Overrides the current thread's CurrentUICulture property for all- /// resource lookups using this strongly typed resource class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Globalization.CultureInfo Culture {- get {- return resourceCulture;- }- set {- resourceCulture = value;- }- }-- /// <summary>- /// Looks up a localized string similar to Password Generator tool.- /// </summary>- internal static string AccessibleName {- get {- return ResourceManager.GetString("AccessibleName", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Configuration.- /// </summary>- internal static string ConfigurationTitle {- get {- return ResourceManager.GetString("ConfigurationTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Generate random passwords.- /// </summary>- internal static string Description {- get {- return ResourceManager.GetString("Description", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Digit characters.- /// </summary>- internal static string Digits {- get {- return ResourceManager.GetString("Digits", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Use digit characters (0123456789).- /// </summary>- internal static string DigitsDescription {- get {- return ResourceManager.GetString("DigitsDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Digits.- /// </summary>- internal static string DigitsDescriptionStateOn {- get {- return ResourceManager.GetString("DigitsDescriptionStateOn", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Whether the generated password can include digits characters (0123456789).- /// </summary>- internal static string DigitsOptionDescription {- get {- return ResourceManager.GetString("DigitsOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to ExcludedCharacters.- /// </summary>- internal static string ExcludeCharacters {- get {- return ResourceManager.GetString("ExcludeCharacters", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Do not use the following characters to generate a password.- /// </summary>- internal static string ExcludeCharactersDescription {- get {- return ResourceManager.GetString("ExcludeCharactersDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Excluding '{0}'.- /// </summary>- internal static string ExcludedCharactersDescriptionState {- get {- return ResourceManager.GetString("ExcludedCharactersDescriptionState", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to A set of characters that should not be used to generate the password.- /// </summary>- internal static string ExcludedCharactersOptionDescription {- get {- return ResourceManager.GetString("ExcludedCharactersOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Generate Password(s).- /// </summary>- internal static string GenerateButton {- get {- return ResourceManager.GetString("GenerateButton", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Generate.- /// </summary>- internal static string GenerateTitle {- get {- return ResourceManager.GetString("GenerateTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Length.- /// </summary>- internal static string Length {- get {- return ResourceManager.GetString("Length", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The length of the password to generate.- /// </summary>- internal static string LengthOptionDescription {- get {- return ResourceManager.GetString("LengthOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Password Generator.- /// </summary>- internal static string LongDisplayTitle {- get {- return ResourceManager.GetString("LongDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Lowercase characters.- /// </summary>- internal static string Lowercase {- get {- return ResourceManager.GetString("Lowercase", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Use lowercase characters (abcdefghijkmnopqrstuvwxyz).- /// </summary>- internal static string LowercaseDescription {- get {- return ResourceManager.GetString("LowercaseDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Lowercase.- /// </summary>- internal static string LowercaseDescriptionStateOn {- get {- return ResourceManager.GetString("LowercaseDescriptionStateOn", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Whether the generated password can include lowercase characters (abcdefghijkmnopqrstuvwxyz).- /// </summary>- internal static string LowercaseOptionDescription {- get {- return ResourceManager.GetString("LowercaseOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to x.- /// </summary>- internal static string MultiplySymbol {- get {- return ResourceManager.GetString("MultiplySymbol", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to No password(s) can be generated because no options have been selected..- /// </summary>- internal static string NoCharacterSetsWarning {- get {- return ResourceManager.GetString("NoCharacterSetsWarning", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Number of Passwords to generate.- /// </summary>- internal static string NumberOfPasswordsToGenerate_AutomationProperties_Name {- get {- return ResourceManager.GetString("NumberOfPasswordsToGenerate_AutomationProperties_Name", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Passwords.- /// </summary>- internal static string Output {- get {- return ResourceManager.GetString("Output", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Passkey Secret Pwd.- /// </summary>- internal static string SearchKeywords {- get {- return ResourceManager.GetString("SearchKeywords", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Password.- /// </summary>- internal static string ShortDisplayTitle {- get {- return ResourceManager.GetString("ShortDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Special characters.- /// </summary>- internal static string SpecialCharacters {- get {- return ResourceManager.GetString("SpecialCharacters", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Use special characters (!@#$%^&*).- /// </summary>- internal static string SpecialCharactersDescription {- get {- return ResourceManager.GetString("SpecialCharactersDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Special characters.- /// </summary>- internal static string SpecialCharactersDescriptionStateOn {- get {- return ResourceManager.GetString("SpecialCharactersDescriptionStateOn", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Whether the generated password can include special characters (!@#$%^&*).- /// </summary>- internal static string SpecialCharactersOptionDescription {- get {- return ResourceManager.GetString("SpecialCharactersOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Uppercase characters.- /// </summary>- internal static string Uppercase {- get {- return ResourceManager.GetString("Uppercase", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Use uppercase characters (ABCDEFGHJKLMNOPQRSTUVWXYZ).- /// </summary>- internal static string UppercaseDescription {- get {- return ResourceManager.GetString("UppercaseDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Uppercase.- /// </summary>- internal static string UppercaseDescriptionStateOn {- get {- return ResourceManager.GetString("UppercaseDescriptionStateOn", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Whether the generated password can include uppercase characters (ABCDEFGHJKLMNOPQRSTUVWXYZ).- /// </summary>- internal static string UppercaseOptionDescription {- get {- return ResourceManager.GetString("UppercaseOptionDescription", resourceCulture);- }- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Generators/Password/PasswordGenerator.resx b/src/app/dev/DevToys.Tools/Tools/Generators/Password/PasswordGenerator.resxdeleted file mode 100644index fe1b69877..000000000--- a/src/app/dev/DevToys.Tools/Tools/Generators/Password/PasswordGenerator.resx+++ /dev/null@@ -1,222 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<root>- <!--- Microsoft ResX Schema-- Version 2.0-- The primary goals of this format is to allow a simple XML format- that is mostly human readable. The generation and parsing of the- various data types are done through the TypeConverter classes- associated with the data types.-- Example:-- ... ado.net/XML headers & schema ...- <resheader name="resmimetype">text/microsoft-resx</resheader>- <resheader name="version">2.0</resheader>- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">- <value>[base64 mime encoded serialized .NET Framework object]</value>- </data>- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>- <comment>This is a comment</comment>- </data>-- There are any number of "resheader" rows that contain simple- name/value pairs.-- Each data row contains a name, and value. The row also contains a- type or mimetype. Type corresponds to a .NET class that support- text/value conversion through the TypeConverter architecture.- Classes that don't support this are serialized and stored with the- mimetype set.-- The mimetype is used for serialized objects, and tells the- ResXResourceReader how to depersist the object. This is currently not- extensible. For a given mimetype the value must be set accordingly:-- Note - application/x-microsoft.net.object.binary.base64 is the format- that the ResXResourceWriter will generate, however the reader can- read any of the formats listed below.-- mimetype: application/x-microsoft.net.object.binary.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.soap.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.bytearray.base64- value : The object must be serialized into a byte array- : using a System.ComponentModel.TypeConverter- : and then encoded with base64 encoding.- -->- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />- <xsd:element name="root" msdata:IsDataSet="true">- <xsd:complexType>- <xsd:choice maxOccurs="unbounded">- <xsd:element name="metadata">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" />- </xsd:sequence>- <xsd:attribute name="name" use="required" type="xsd:string" />- <xsd:attribute name="type" type="xsd:string" />- <xsd:attribute name="mimetype" type="xsd:string" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="assembly">- <xsd:complexType>- <xsd:attribute name="alias" type="xsd:string" />- <xsd:attribute name="name" type="xsd:string" />- </xsd:complexType>- </xsd:element>- <xsd:element name="data">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="resheader">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" />- </xsd:complexType>- </xsd:element>- </xsd:choice>- </xsd:complexType>- </xsd:element>- </xsd:schema>- <resheader name="resmimetype">- <value>text/microsoft-resx</value>- </resheader>- <resheader name="version">- <value>2.0</value>- </resheader>- <resheader name="reader">- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <resheader name="writer">- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <data name="AccessibleName" xml:space="preserve">- <value>Password Generator tool</value>- </data>- <data name="ConfigurationTitle" xml:space="preserve">- <value>Configuration</value>- </data>- <data name="Description" xml:space="preserve">- <value>Generate random passwords</value>- </data>- <data name="Digits" xml:space="preserve">- <value>Digit characters</value>- </data>- <data name="DigitsDescription" xml:space="preserve">- <value>Use digit characters (0123456789)</value>- </data>- <data name="DigitsDescriptionStateOn" xml:space="preserve">- <value>Digits</value>- </data>- <data name="DigitsOptionDescription" xml:space="preserve">- <value>Whether the generated password can include digits characters (0123456789)</value>- </data>- <data name="ExcludeCharacters" xml:space="preserve">- <value>ExcludedCharacters</value>- </data>- <data name="ExcludeCharactersDescription" xml:space="preserve">- <value>Do not use the following characters to generate a password</value>- </data>- <data name="ExcludedCharactersDescriptionState" xml:space="preserve">- <value>Excluding '{0}'</value>- </data>- <data name="ExcludedCharactersOptionDescription" xml:space="preserve">- <value>A set of characters that should not be used to generate the password</value>- </data>- <data name="GenerateButton" xml:space="preserve">- <value>Generate Password(s)</value>- </data>- <data name="GenerateTitle" xml:space="preserve">- <value>Generate</value>- </data>- <data name="Length" xml:space="preserve">- <value>Length</value>- </data>- <data name="LengthOptionDescription" xml:space="preserve">- <value>The length of the password to generate</value>- </data>- <data name="LongDisplayTitle" xml:space="preserve">- <value>Password Generator</value>- </data>- <data name="Lowercase" xml:space="preserve">- <value>Lowercase characters</value>- </data>- <data name="LowercaseDescription" xml:space="preserve">- <value>Use lowercase characters (abcdefghijkmnopqrstuvwxyz)</value>- </data>- <data name="LowercaseDescriptionStateOn" xml:space="preserve">- <value>Lowercase</value>- </data>- <data name="LowercaseOptionDescription" xml:space="preserve">- <value>Whether the generated password can include lowercase characters (abcdefghijkmnopqrstuvwxyz)</value>- </data>- <data name="MultiplySymbol" xml:space="preserve">- <value>x</value>- </data>- <data name="NoCharacterSetsWarning" xml:space="preserve">- <value>No password(s) can be generated because no options have been selected.</value>- </data>- <data name="NumberOfPasswordsToGenerate_AutomationProperties_Name" xml:space="preserve">- <value>Number of Passwords to generate</value>- </data>- <data name="Output" xml:space="preserve">- <value>Passwords</value>- </data>- <data name="SearchKeywords" xml:space="preserve">- <value>Passkey Secret Pwd</value>- </data>- <data name="ShortDisplayTitle" xml:space="preserve">- <value>Password</value>- </data>- <data name="SpecialCharacters" xml:space="preserve">- <value>Special characters</value>- </data>- <data name="SpecialCharactersDescription" xml:space="preserve">- <value>Use special characters (!@#$%^&*)</value>- </data>- <data name="SpecialCharactersDescriptionStateOn" xml:space="preserve">- <value>Special characters</value>- </data>- <data name="SpecialCharactersOptionDescription" xml:space="preserve">- <value>Whether the generated password can include special characters (!@#$%^&*)</value>- </data>- <data name="Uppercase" xml:space="preserve">- <value>Uppercase characters</value>- </data>- <data name="UppercaseDescription" xml:space="preserve">- <value>Use uppercase characters (ABCDEFGHJKLMNOPQRSTUVWXYZ)</value>- </data>- <data name="UppercaseDescriptionStateOn" xml:space="preserve">- <value>Uppercase</value>- </data>- <data name="UppercaseOptionDescription" xml:space="preserve">- <value>Whether the generated password can include uppercase characters (ABCDEFGHJKLMNOPQRSTUVWXYZ)</value>- </data>-</root>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/Generators/Password/PasswordGeneratorCommandLineTool.cs b/src/app/dev/DevToys.Tools/Tools/Generators/Password/PasswordGeneratorCommandLineTool.csdeleted file mode 100644index 52ff352bb..000000000--- a/src/app/dev/DevToys.Tools/Tools/Generators/Password/PasswordGeneratorCommandLineTool.cs+++ /dev/null@@ -1,65 +0,0 @@-using DevToys.Tools.Helpers;-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.Tools.Generators.Password;--[Export(typeof(ICommandLineTool))]-[Name("PasswordGenerator")]-[CommandName(- Name = "password",- Alias = "pwd",- ResourceManagerBaseName = "DevToys.Tools.Tools.Generators.Password.PasswordGenerator",- DescriptionResourceName = nameof(PasswordGenerator.Description))]-internal sealed class PasswordGeneratorCommandLineTool : ICommandLineTool-{- [CommandLineOption(- Name = "length",- Alias = "l",- DescriptionResourceName = nameof(PasswordGenerator.LengthOptionDescription))]- internal int Length { get; set; } = 30;-- [CommandLineOption(- Name = "uppercase",- Alias = "u",- DescriptionResourceName = nameof(PasswordGenerator.UppercaseOptionDescription))]- internal bool Uppercase { get; set; } = true;-- [CommandLineOption(- Name = "lowercase",- Alias = "m",- DescriptionResourceName = nameof(PasswordGenerator.LowercaseOptionDescription))]- internal bool Lowercase { get; set; } = true;-- [CommandLineOption(- Name = "digits",- Alias = "d",- DescriptionResourceName = nameof(PasswordGenerator.DigitsOptionDescription))]- internal bool Digits { get; set; } = true;-- [CommandLineOption(- Name = "special",- Alias = "s",- DescriptionResourceName = nameof(PasswordGenerator.SpecialCharactersOptionDescription))]- internal bool SpecialCharacters { get; set; } = true;-- [CommandLineOption(- Name = "excluded",- Alias = "e",- DescriptionResourceName = nameof(PasswordGenerator.ExcludedCharactersOptionDescription))]- internal string ExcludedCharacters { get; set; } = string.Empty;-- public ValueTask<int> InvokeAsync(ILogger logger, CancellationToken cancellationToken)- {- string password- = PasswordGeneratorHelper.GeneratePassword(- Length,- Uppercase,- Lowercase,- Digits,- SpecialCharacters,- ExcludedCharacters.ToArray());-- Console.WriteLine(password);- return ValueTask.FromResult(0);- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Generators/Password/PasswordGeneratorGuidTool.cs b/src/app/dev/DevToys.Tools/Tools/Generators/Password/PasswordGeneratorGuidTool.csdeleted file mode 100644index 6438b8a6a..000000000--- a/src/app/dev/DevToys.Tools/Tools/Generators/Password/PasswordGeneratorGuidTool.cs+++ /dev/null@@ -1,314 +0,0 @@-using System.Text;-using DevToys.Tools.Helpers;--namespace DevToys.Tools.Tools.Generators.Password;--[Export(typeof(IGuiTool))]-[Name("PasswordGenerator")]-[ToolDisplayInformation(- IconFontName = "FluentSystemIcons",- IconGlyph = '\uE8C9',- GroupName = PredefinedCommonToolGroupNames.Generators,- ResourceManagerAssemblyIdentifier = nameof(DevToysToolsResourceManagerAssemblyIdentifier),- ResourceManagerBaseName = "DevToys.Tools.Tools.Generators.Password.PasswordGenerator",- ShortDisplayTitleResourceName = nameof(PasswordGenerator.ShortDisplayTitle),- LongDisplayTitleResourceName = nameof(PasswordGenerator.LongDisplayTitle),- DescriptionResourceName = nameof(PasswordGenerator.Description),- SearchKeywordsResourceName = nameof(PasswordGenerator.SearchKeywords),- AccessibleNameResourceName = nameof(PasswordGenerator.AccessibleName))]-internal sealed class PasswordGeneratorGuidTool : IGuiTool-{- /// <summary>- /// Whether the password should include uppercase characters.- /// </summary>- private static readonly SettingDefinition<bool> uppercase- = new(- name: $"{nameof(PasswordGeneratorGuidTool)}.{nameof(uppercase)}",- defaultValue: true);-- /// <summary>- /// Whether the password should include lowercase characters.- /// </summary>- private static readonly SettingDefinition<bool> lowercase- = new(- name: $"{nameof(PasswordGeneratorGuidTool)}.{nameof(lowercase)}",- defaultValue: true);-- /// <summary>- /// Whether the password should include numbers.- /// </summary>- private static readonly SettingDefinition<bool> numbers- = new(- name: $"{nameof(PasswordGeneratorGuidTool)}.{nameof(numbers)}",- defaultValue: true);-- /// <summary>- /// Whether the password should include special characters.- /// </summary>- private static readonly SettingDefinition<bool> specialCharacters- = new(- name: $"{nameof(PasswordGeneratorGuidTool)}.{nameof(specialCharacters)}",- defaultValue: true);-- /// <summary>- /// Excluded characters from password.- /// </summary>- private static readonly SettingDefinition<string> excludedCharacters- = new(- name: $"{nameof(PasswordGeneratorGuidTool)}.{nameof(excludedCharacters)}",- defaultValue: string.Empty);-- /// <summary>- /// How long the password should be.- /// </summary>- private static readonly SettingDefinition<int> length- = new(- name: $"{nameof(PasswordGeneratorGuidTool)}.{nameof(length)}",- defaultValue: 30);-- /// <summary>- /// How many passwords should be generated at once.- /// </summary>- private static readonly SettingDefinition<int> passwordsToGenerate- = new(- name: $"{nameof(PasswordGeneratorGuidTool)}.{nameof(passwordsToGenerate)}",- defaultValue: 1);-- private enum GridColumn- {- Stretch- }-- private enum GridRow- {- Settings,- Results- }-- private readonly ISettingsProvider _settingsProvider;- private readonly IUIMultiLineTextInput _outputText = MultilineTextInput();- private readonly IUISetting _excludedCharactersSetting = Setting();- private readonly IUIInfoBar _infoBar = InfoBar();-- [ImportingConstructor]- public PasswordGeneratorGuidTool(ISettingsProvider settingsProvider)- {- _settingsProvider = settingsProvider;-- OnGenerateButtonClick();- }-- public UIToolView View- => new(- isScrollable: true,- Grid()- .ColumnLargeSpacing()- .RowLargeSpacing()- .Rows(- (GridRow.Settings, Auto),- (GridRow.Results, new UIGridLength(1, UIGridUnitType.Fraction)))- .Columns(- (GridColumn.Stretch, new UIGridLength(1, UIGridUnitType.Fraction)))-- .Cells(- Cell(- GridRow.Settings,- GridColumn.Stretch,- Stack()- .Vertical()- .LargeSpacing()- .WithChildren(-- Stack()- .Vertical()- .WithChildren(-- Label().Text(PasswordGenerator.ConfigurationTitle),-- SettingGroup()- .Icon("FluentSystemIcons", '\uF57D')- .Title(PasswordGenerator.Length)- .InteractiveElement(- NumberInput()- .HideCommandBar()- .Minimum(5)- .OnValueChanged(OnLengthChanged)- .Value(_settingsProvider.GetSetting(length)))- .WithSettings(-- Setting()- .Title(PasswordGenerator.Lowercase)- .Description(PasswordGenerator.LowercaseDescription)- .Handle(- _settingsProvider,- lowercase,- stateDescriptionWhenOn: PasswordGenerator.LowercaseDescriptionStateOn,- stateDescriptionWhenOff: null,- OnSettingChanged),-- Setting()- .Title(PasswordGenerator.Uppercase)- .Description(PasswordGenerator.UppercaseDescription)- .Handle(- _settingsProvider,- uppercase,- stateDescriptionWhenOn: PasswordGenerator.UppercaseDescriptionStateOn,- stateDescriptionWhenOff: null,- OnSettingChanged),-- Setting()- .Title(PasswordGenerator.Digits)- .Description(PasswordGenerator.DigitsDescription)- .Handle(- _settingsProvider,- numbers,- stateDescriptionWhenOn: PasswordGenerator.DigitsDescriptionStateOn,- stateDescriptionWhenOff: null,- OnSettingChanged),-- Setting()- .Title(PasswordGenerator.SpecialCharacters)- .Description(PasswordGenerator.SpecialCharactersDescription)- .Handle(- _settingsProvider,- specialCharacters,- stateDescriptionWhenOn: PasswordGenerator.SpecialCharactersDescriptionStateOn,- stateDescriptionWhenOff: null,- OnSettingChanged),-- _excludedCharactersSetting- .Title(PasswordGenerator.ExcludeCharacters)- .StateDescription(GenerateExcludedCharactersDescriptionState())- .InteractiveElement(- SingleLineTextInput()- .HideCommandBar()- .Text(_settingsProvider.GetSetting(excludedCharacters))- .OnTextChanged(OnExcludedCharactersChanged))),-- _infoBar- .Warning()- .Description(PasswordGenerator.NoCharacterSetsWarning)- .NonClosable()),-- Stack()- .Vertical()- .WithChildren(-- Label().Text(PasswordGenerator.GenerateTitle),- Stack()- .Horizontal()- .SmallSpacing()- .WithChildren(-- Button()- .AccentAppearance()- .Text(PasswordGenerator.GenerateButton)- .OnClick(OnGenerateButtonClick),-- Label().Style(UILabelStyle.BodyStrong).Text(PasswordGenerator.MultiplySymbol),-- NumberInput()- .HideCommandBar()- .Minimum(1)- .Maximum(10000)- .OnValueChanged(OnNumberOfPasswordsToGenerateChanged)- .Value(_settingsProvider.GetSetting(passwordsToGenerate)))))),-- Cell(- GridRow.Results,- GridColumn.Stretch,-- _outputText- .Title(PasswordGenerator.Output)- .ReadOnly())));-- private bool HasAnyCharacterSets- => _settingsProvider.GetSetting(uppercase)- || _settingsProvider.GetSetting(lowercase)- || _settingsProvider.GetSetting(numbers)- || _settingsProvider.GetSetting(specialCharacters);-- public void OnDataReceived(string dataTypeName, object? parsedData)- {- }-- private void OnSettingChanged(bool value)- {- OnGenerateButtonClick();- }-- private void OnLengthChanged(double value)- {- _settingsProvider.SetSetting(length, (int)value);- OnGenerateButtonClick();- }-- private void OnExcludedCharactersChanged(string value)- {- _settingsProvider.SetSetting(excludedCharacters, value);- _excludedCharactersSetting.StateDescription(GenerateExcludedCharactersDescriptionState());-- OnGenerateButtonClick();- }-- private void OnNumberOfPasswordsToGenerateChanged(double value)- {- _settingsProvider.SetSetting(passwordsToGenerate, (int)value);- OnGenerateButtonClick();- }-- private void OnGenerateButtonClick()- {- // There are no character sets selected, so we can't generate anything.- if (!HasAnyCharacterSets)- {- _infoBar.Open();- _outputText.Text(string.Empty);- return;- }- else- {- _infoBar.Close();- }-- bool hasUppercase = _settingsProvider.GetSetting(uppercase);- bool hasLowercase = _settingsProvider.GetSetting(lowercase);- bool hasNumbers = _settingsProvider.GetSetting(numbers);- bool hasSpecialCharacters = _settingsProvider.GetSetting(specialCharacters);- char[] excludedCharactersList = _settingsProvider.GetSetting(excludedCharacters).ToCharArray();- int passwordLength = _settingsProvider.GetSetting(length);-- // Generate a random password using the the combined character set.- var newPasswords = new StringBuilder();- for (int i = 0; i < _settingsProvider.GetSetting(passwordsToGenerate); i++)- {- string password- = PasswordGeneratorHelper.GeneratePassword(- passwordLength,- hasUppercase,- hasLowercase,- hasNumbers,- hasSpecialCharacters,- excludedCharactersList);-- if (password.Length > 0)- {- newPasswords.AppendLine(password);- }- }-- _outputText.Text(newPasswords.ToString());- }-- private string GenerateExcludedCharactersDescriptionState()- {- if (_settingsProvider.GetSetting(excludedCharacters).Length == 0)- {- return string.Empty;- }- else- {- return string.Format(PasswordGenerator.ExcludedCharactersDescriptionState, _settingsProvider.GetSetting(excludedCharacters));- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Generators/UUID/UUIDGenerator.Designer.cs b/src/app/dev/DevToys.Tools/Tools/Generators/UUID/UUIDGenerator.Designer.csdeleted file mode 100644index 799484cec..000000000--- a/src/app/dev/DevToys.Tools/Tools/Generators/UUID/UUIDGenerator.Designer.cs+++ /dev/null@@ -1,234 +0,0 @@-//-------------------------------------------------------------------------------// <auto-generated>-// This code was generated by a tool.-// Runtime Version:4.0.30319.42000-//-// Changes to this file may cause incorrect behavior and will be lost if-// the code is regenerated.-// </auto-generated>-//--------------------------------------------------------------------------------namespace DevToys.Tools.Tools.Generators.UUID {- using System;--- /// <summary>- /// A strongly-typed resource class, for looking up localized strings, etc.- /// </summary>- // This class was auto-generated by the StronglyTypedResourceBuilder- // class via a tool like ResGen or Visual Studio.- // To add or remove a member, edit your .ResX file then rerun ResGen- // with the /str option, or rebuild your VS project.- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]- internal class UUIDGenerator {-- private static global::System.Resources.ResourceManager resourceMan;-- private static global::System.Globalization.CultureInfo resourceCulture;-- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]- internal UUIDGenerator() {- }-- /// <summary>- /// Returns the cached ResourceManager instance used by this class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Resources.ResourceManager ResourceManager {- get {- if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Tools.Tools.Generators.UUID.UUIDGenerator", typeof(UUIDGenerator).Assembly);- resourceMan = temp;- }- return resourceMan;- }- }-- /// <summary>- /// Overrides the current thread's CurrentUICulture property for all- /// resource lookups using this strongly typed resource class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Globalization.CultureInfo Culture {- get {- return resourceCulture;- }- set {- resourceCulture = value;- }- }-- /// <summary>- /// Looks up a localized string similar to UUID Generator tool.- /// </summary>- internal static string AccessibleName {- get {- return ResourceManager.GetString("AccessibleName", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Configuration.- /// </summary>- internal static string ConfigurationTitle {- get {- return ResourceManager.GetString("ConfigurationTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Generate UUIDs version 1 and 4 (GUID).- /// </summary>- internal static string Description {- get {- return ResourceManager.GetString("Description", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Generate UUID(s).- /// </summary>- internal static string GenerateButton {- get {- return ResourceManager.GetString("GenerateButton", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Generate.- /// </summary>- internal static string GenerateTitle {- get {- return ResourceManager.GetString("GenerateTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Hyphens.- /// </summary>- internal static string Hyphens {- get {- return ResourceManager.GetString("Hyphens", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Whether the generated UUID should have hyphens or not.- /// </summary>- internal static string HyphensOptionDescription {- get {- return ResourceManager.GetString("HyphensOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to UUID Generator.- /// </summary>- internal static string LongDisplayTitle {- get {- return ResourceManager.GetString("LongDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to x.- /// </summary>- internal static string MultiplySymbol {- get {- return ResourceManager.GetString("MultiplySymbol", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to UUID(s).- /// </summary>- internal static string Output {- get {- return ResourceManager.GetString("Output", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to GUID.- /// </summary>- internal static string SearchKeywords {- get {- return ResourceManager.GetString("SearchKeywords", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to UUID.- /// </summary>- internal static string ShortDisplayTitle {- get {- return ResourceManager.GetString("ShortDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Uppercase.- /// </summary>- internal static string Uppercase {- get {- return ResourceManager.GetString("Uppercase", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Whether the generated UUID should be in uppercase or not.- /// </summary>- internal static string UppercaseOptionDescription {- get {- return ResourceManager.GetString("UppercaseOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to 4 (GUID).- /// </summary>- internal static string UuidVersionFour {- get {- return ResourceManager.GetString("UuidVersionFour", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to 1.- /// </summary>- internal static string UuidVersionOne {- get {- return ResourceManager.GetString("UuidVersionOne", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Choose the version of UUID to generate.- /// </summary>- internal static string VersionDescription {- get {- return ResourceManager.GetString("VersionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The UUID version to generate.- /// </summary>- internal static string VersionOptionDescription {- get {- return ResourceManager.GetString("VersionOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to UUID version.- /// </summary>- internal static string VersionTitle {- get {- return ResourceManager.GetString("VersionTitle", resourceCulture);- }- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Generators/UUID/UUIDGenerator.resx b/src/app/dev/DevToys.Tools/Tools/Generators/UUID/UUIDGenerator.resxdeleted file mode 100644index 47da26afa..000000000--- a/src/app/dev/DevToys.Tools/Tools/Generators/UUID/UUIDGenerator.resx+++ /dev/null@@ -1,177 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<root>- <!--- Microsoft ResX Schema-- Version 2.0-- The primary goals of this format is to allow a simple XML format- that is mostly human readable. The generation and parsing of the- various data types are done through the TypeConverter classes- associated with the data types.-- Example:-- ... ado.net/XML headers & schema ...- <resheader name="resmimetype">text/microsoft-resx</resheader>- <resheader name="version">2.0</resheader>- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">- <value>[base64 mime encoded serialized .NET Framework object]</value>- </data>- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>- <comment>This is a comment</comment>- </data>-- There are any number of "resheader" rows that contain simple- name/value pairs.-- Each data row contains a name, and value. The row also contains a- type or mimetype. Type corresponds to a .NET class that support- text/value conversion through the TypeConverter architecture.- Classes that don't support this are serialized and stored with the- mimetype set.-- The mimetype is used for serialized objects, and tells the- ResXResourceReader how to depersist the object. This is currently not- extensible. For a given mimetype the value must be set accordingly:-- Note - application/x-microsoft.net.object.binary.base64 is the format- that the ResXResourceWriter will generate, however the reader can- read any of the formats listed below.-- mimetype: application/x-microsoft.net.object.binary.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.soap.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.bytearray.base64- value : The object must be serialized into a byte array- : using a System.ComponentModel.TypeConverter- : and then encoded with base64 encoding.- -->- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />- <xsd:element name="root" msdata:IsDataSet="true">- <xsd:complexType>- <xsd:choice maxOccurs="unbounded">- <xsd:element name="metadata">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" />- </xsd:sequence>- <xsd:attribute name="name" use="required" type="xsd:string" />- <xsd:attribute name="type" type="xsd:string" />- <xsd:attribute name="mimetype" type="xsd:string" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="assembly">- <xsd:complexType>- <xsd:attribute name="alias" type="xsd:string" />- <xsd:attribute name="name" type="xsd:string" />- </xsd:complexType>- </xsd:element>- <xsd:element name="data">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="resheader">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" />- </xsd:complexType>- </xsd:element>- </xsd:choice>- </xsd:complexType>- </xsd:element>- </xsd:schema>- <resheader name="resmimetype">- <value>text/microsoft-resx</value>- </resheader>- <resheader name="version">- <value>2.0</value>- </resheader>- <resheader name="reader">- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <resheader name="writer">- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <data name="AccessibleName" xml:space="preserve">- <value>UUID Generator tool</value>- </data>- <data name="ConfigurationTitle" xml:space="preserve">- <value>Configuration</value>- </data>- <data name="Description" xml:space="preserve">- <value>Generate UUIDs version 1 and 4 (GUID)</value>- </data>- <data name="GenerateButton" xml:space="preserve">- <value>Generate UUID(s)</value>- </data>- <data name="GenerateTitle" xml:space="preserve">- <value>Generate</value>- </data>- <data name="Hyphens" xml:space="preserve">- <value>Hyphens</value>- </data>- <data name="HyphensOptionDescription" xml:space="preserve">- <value>Whether the generated UUID should have hyphens or not</value>- </data>- <data name="LongDisplayTitle" xml:space="preserve">- <value>UUID Generator</value>- </data>- <data name="MultiplySymbol" xml:space="preserve">- <value>x</value>- </data>- <data name="Output" xml:space="preserve">- <value>UUID(s)</value>- </data>- <data name="SearchKeywords" xml:space="preserve">- <value>GUID</value>- </data>- <data name="ShortDisplayTitle" xml:space="preserve">- <value>UUID</value>- </data>- <data name="Uppercase" xml:space="preserve">- <value>Uppercase</value>- </data>- <data name="UppercaseOptionDescription" xml:space="preserve">- <value>Whether the generated UUID should be in uppercase or not</value>- </data>- <data name="UuidVersionFour" xml:space="preserve">- <value>4 (GUID)</value>- </data>- <data name="UuidVersionOne" xml:space="preserve">- <value>1</value>- </data>- <data name="VersionDescription" xml:space="preserve">- <value>Choose the version of UUID to generate</value>- </data>- <data name="VersionOptionDescription" xml:space="preserve">- <value>The UUID version to generate</value>- </data>- <data name="VersionTitle" xml:space="preserve">- <value>UUID version</value>- </data>-</root>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/Generators/UUID/UUIDGeneratorCommandLineTool.cs b/src/app/dev/DevToys.Tools/Tools/Generators/UUID/UUIDGeneratorCommandLineTool.csdeleted file mode 100644index 8ee3935ad..000000000--- a/src/app/dev/DevToys.Tools/Tools/Generators/UUID/UUIDGeneratorCommandLineTool.cs+++ /dev/null@@ -1,45 +0,0 @@-using DevToys.Tools.Helpers;-using DevToys.Tools.Models;-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.Tools.Generators.UUID;--[Export(typeof(ICommandLineTool))]-[Name("UUIDGenerator")]-[CommandName(- Name = "uuid",- Alias = "guid",- ResourceManagerBaseName = "DevToys.Tools.Tools.Generators.UUID.UUIDGenerator",- DescriptionResourceName = nameof(UUIDGenerator.Description))]-internal sealed class UUIDGeneratorCommandLineTool : ICommandLineTool-{- [CommandLineOption(- Name = "version",- Alias = "v",- DescriptionResourceName = nameof(UUIDGenerator.VersionOptionDescription))]- internal UuidVersion Version { get; set; } = UuidVersion.Four;-- [CommandLineOption(- Name = "hyphens",- Alias = "h",- DescriptionResourceName = nameof(UUIDGenerator.HyphensOptionDescription))]- internal bool Hyphens { get; set; } = true;-- [CommandLineOption(- Name = "uppercase",- Alias = "u",- DescriptionResourceName = nameof(UUIDGenerator.UppercaseOptionDescription))]- internal bool Uppercase { get; set; } = false;-- public ValueTask<int> InvokeAsync(ILogger logger, CancellationToken cancellationToken)- {- string newUuid- = UuidHelper.GenerateUuid(- Version,- Hyphens,- Uppercase);-- Console.WriteLine(newUuid);- return ValueTask.FromResult(0);- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Generators/UUID/UUIDGeneratorGuidTool.cs b/src/app/dev/DevToys.Tools/Tools/Generators/UUID/UUIDGeneratorGuidTool.csdeleted file mode 100644index 96e5beeb5..000000000--- a/src/app/dev/DevToys.Tools/Tools/Generators/UUID/UUIDGeneratorGuidTool.cs+++ /dev/null@@ -1,199 +0,0 @@-using System.Text;-using DevToys.Tools.Helpers;-using DevToys.Tools.Models;--namespace DevToys.Tools.Tools.Generators.UUID;--[Export(typeof(IGuiTool))]-[Name("UUIDGenerator")]-[ToolDisplayInformation(- IconFontName = "DevToys-Tools-Icons",- IconGlyph = '\u0106',- GroupName = PredefinedCommonToolGroupNames.Generators,- ResourceManagerAssemblyIdentifier = nameof(DevToysToolsResourceManagerAssemblyIdentifier),- ResourceManagerBaseName = "DevToys.Tools.Tools.Generators.UUID.UUIDGenerator",- ShortDisplayTitleResourceName = nameof(UUIDGenerator.ShortDisplayTitle),- LongDisplayTitleResourceName = nameof(UUIDGenerator.LongDisplayTitle),- DescriptionResourceName = nameof(UUIDGenerator.Description),- SearchKeywordsResourceName = nameof(UUIDGenerator.SearchKeywords),- AccessibleNameResourceName = nameof(UUIDGenerator.AccessibleName))]-internal sealed class UUIDGeneratorGuidTool : IGuiTool-{- /// <summary>- /// Whether the generated UUID should have hyphens or not.- /// </summary>- private static readonly SettingDefinition<bool> hyphens- = new(- name: $"{nameof(UUIDGeneratorGuidTool)}.{nameof(hyphens)}",- defaultValue: true);-- /// <summary>- /// Whether the generated UUID should be uppercase or lowercase.- /// </summary>- private static readonly SettingDefinition<bool> uppercase- = new(- name: $"{nameof(UUIDGeneratorGuidTool)}.{nameof(uppercase)}",- defaultValue: false);-- /// <summary>- /// The UUID Version to generate.- /// </summary>- private static readonly SettingDefinition<UuidVersion> version- = new(- name: $"{nameof(UUIDGeneratorGuidTool)}.{nameof(version)}",- defaultValue: UuidVersion.Four);-- /// <summary>- /// How many GUIDs should be generated at once.- /// </summary>- private static readonly SettingDefinition<int> uuidToGenerate- = new(- name: $"{nameof(UUIDGeneratorGuidTool)}.{nameof(uuidToGenerate)}",- defaultValue: 1);-- private enum GridColumn- {- Stretch- }-- private enum GridRow- {- Settings,- Results- }-- private readonly ISettingsProvider _settingsProvider;- private readonly IUIMultiLineTextInput _outputText = MultilineTextInput();-- [ImportingConstructor]- public UUIDGeneratorGuidTool(ISettingsProvider settingsProvider)- {- _settingsProvider = settingsProvider;-- OnGenerateButtonClick();- }-- public UIToolView View- => new(- isScrollable: true,- Grid()- .ColumnLargeSpacing()- .RowLargeSpacing()- .Rows(- (GridRow.Settings, Auto),- (GridRow.Results, new UIGridLength(1, UIGridUnitType.Fraction)))- .Columns(- (GridColumn.Stretch, new UIGridLength(1, UIGridUnitType.Fraction)))-- .Cells(- Cell(- GridRow.Settings,- GridColumn.Stretch,- Stack()- .Vertical()- .LargeSpacing()- .WithChildren(-- Stack()- .Vertical()- .WithChildren(-- Label().Text(UUIDGenerator.ConfigurationTitle),-- Setting()- .Icon("FluentSystemIcons", '\uF4E0')- .Title(UUIDGenerator.Hyphens)- .Handle(- _settingsProvider,- hyphens,- OnSettingChanged),-- Setting()- .Icon("FluentSystemIcons", '\uF7B2')- .Title(UUIDGenerator.Uppercase)- .Handle(- _settingsProvider,- uppercase,- OnSettingChanged),-- Setting()- .Icon("FluentSystemIcons", '\uF587')- .Title(UUIDGenerator.VersionTitle)- .Description(UUIDGenerator.VersionDescription)- .Handle(- _settingsProvider,- version,- OnSettingChanged,- Item(UUIDGenerator.UuidVersionOne, UuidVersion.One),- Item(UUIDGenerator.UuidVersionFour, UuidVersion.Four))),-- Stack()- .Vertical()- .WithChildren(-- Label().Text(UUIDGenerator.GenerateTitle),- Stack()- .Horizontal()- .SmallSpacing()- .WithChildren(-- Button()- .AccentAppearance()- .Text(UUIDGenerator.GenerateButton)- .OnClick(OnGenerateButtonClick),-- Label().Style(UILabelStyle.BodyStrong).Text(UUIDGenerator.MultiplySymbol),-- NumberInput()- .HideCommandBar()- .Minimum(1)- .Maximum(10000)- .OnValueChanged(OnNumberOfUuidsToGenerateChanged)- .Value(_settingsProvider.GetSetting(uuidToGenerate)))))),-- Cell(- GridRow.Results,- GridColumn.Stretch,-- _outputText- .Title(UUIDGenerator.Output)- .ReadOnly())));-- public void OnDataReceived(string dataTypeName, object? parsedData)- {- }-- private void OnSettingChanged(bool value)- {- OnGenerateButtonClick();- }-- private void OnSettingChanged(UuidVersion value)- {- OnGenerateButtonClick();- }-- private void OnNumberOfUuidsToGenerateChanged(double value)- {- _settingsProvider.SetSetting(uuidToGenerate, (int)value);- OnGenerateButtonClick();- }-- private void OnGenerateButtonClick()- {- var newGuids = new StringBuilder();-- for (int i = 0; i < Math.Max(_settingsProvider.GetSetting(uuidToGenerate), 1); i++)- {- string newUuid- = UuidHelper.GenerateUuid(- _settingsProvider.GetSetting(version),- _settingsProvider.GetSetting(hyphens),- _settingsProvider.GetSetting(uppercase));-- newGuids.AppendLine(newUuid);- }-- _outputText.Text(newGuids.ToString());- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Graphic/ColorBlindnessSimulator/ColorBlindnessSimulator.Designer.cs b/src/app/dev/DevToys.Tools/Tools/Graphic/ColorBlindnessSimulator/ColorBlindnessSimulator.Designer.csdeleted file mode 100644index 2628a028d..000000000--- a/src/app/dev/DevToys.Tools/Tools/Graphic/ColorBlindnessSimulator/ColorBlindnessSimulator.Designer.cs+++ /dev/null@@ -1,171 +0,0 @@-//-------------------------------------------------------------------------------// <auto-generated>-// This code was generated by a tool.-// Runtime Version:4.0.30319.42000-//-// Changes to this file may cause incorrect behavior and will be lost if-// the code is regenerated.-// </auto-generated>-//--------------------------------------------------------------------------------namespace DevToys.Tools.Tools.Graphic.ColorBlindnessSimulator {- using System;--- /// <summary>- /// A strongly-typed resource class, for looking up localized strings, etc.- /// </summary>- // This class was auto-generated by the StronglyTypedResourceBuilder- // class via a tool like ResGen or Visual Studio.- // To add or remove a member, edit your .ResX file then rerun ResGen- // with the /str option, or rebuild your VS project.- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]- internal class ColorBlindnessSimulator {-- private static global::System.Resources.ResourceManager resourceMan;-- private static global::System.Globalization.CultureInfo resourceCulture;-- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]- internal ColorBlindnessSimulator() {- }-- /// <summary>- /// Returns the cached ResourceManager instance used by this class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Resources.ResourceManager ResourceManager {- get {- if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Tools.Tools.Graphic.ColorBlindnessSimulator.ColorBlindnessSimulator", typeof(ColorBlindnessSimulator).Assembly);- resourceMan = temp;- }- return resourceMan;- }- }-- /// <summary>- /// Overrides the current thread's CurrentUICulture property for all- /// resource lookups using this strongly typed resource class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Globalization.CultureInfo Culture {- get {- return resourceCulture;- }- set {- resourceCulture = value;- }- }-- /// <summary>- /// Looks up a localized string similar to Color Blindness Simulator tool.- /// </summary>- internal static string AccessibleName {- get {- return ResourceManager.GetString("AccessibleName", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Simulate color blindness on a picture or screenshot.- /// </summary>- internal static string Description {- get {- return ResourceManager.GetString("Description", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Deuteranopia simulation.- /// </summary>- internal static string DeuteranopiaSimulation {- get {- return ResourceManager.GetString("DeuteranopiaSimulation", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Image file path to treat.- /// </summary>- internal static string InputOptionDescription {- get {- return ResourceManager.GetString("InputOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Color Blindness Simulator.- /// </summary>- internal static string LongDisplayTitle {- get {- return ResourceManager.GetString("LongDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Original.- /// </summary>- internal static string OriginalPicture {- get {- return ResourceManager.GetString("OriginalPicture", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Directory where the result should be persisted. By default, use input file's directory.- /// </summary>- internal static string OutputDirectoryOptionDescription {- get {- return ResourceManager.GetString("OutputDirectoryOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Protanopia simulation.- /// </summary>- internal static string ProtanopiaSimulation {- get {- return ResourceManager.GetString("ProtanopiaSimulation", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Tritanopia Protanopia Deuteranopia Dalton Daltonism Daltonist.- /// </summary>- internal static string SearchKeywords {- get {- return ResourceManager.GetString("SearchKeywords", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Color Blindness Simulator.- /// </summary>- internal static string ShortDisplayTitle {- get {- return ResourceManager.GetString("ShortDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Hides the progress of the hashing operation.- /// </summary>- internal static string SilentOptionDescription {- get {- return ResourceManager.GetString("SilentOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Tritanopia simulation.- /// </summary>- internal static string TritanopiaSimulation {- get {- return ResourceManager.GetString("TritanopiaSimulation", resourceCulture);- }- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Graphic/ColorBlindnessSimulator/ColorBlindnessSimulator.resx b/src/app/dev/DevToys.Tools/Tools/Graphic/ColorBlindnessSimulator/ColorBlindnessSimulator.resxdeleted file mode 100644index 90b653dd2..000000000--- a/src/app/dev/DevToys.Tools/Tools/Graphic/ColorBlindnessSimulator/ColorBlindnessSimulator.resx+++ /dev/null@@ -1,157 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<root>- <!--- Microsoft ResX Schema-- Version 2.0-- The primary goals of this format is to allow a simple XML format- that is mostly human readable. The generation and parsing of the- various data types are done through the TypeConverter classes- associated with the data types.-- Example:-- ... ado.net/XML headers & schema ...- <resheader name="resmimetype">text/microsoft-resx</resheader>- <resheader name="version">2.0</resheader>- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">- <value>[base64 mime encoded serialized .NET Framework object]</value>- </data>- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>- <comment>This is a comment</comment>- </data>-- There are any number of "resheader" rows that contain simple- name/value pairs.-- Each data row contains a name, and value. The row also contains a- type or mimetype. Type corresponds to a .NET class that support- text/value conversion through the TypeConverter architecture.- Classes that don't support this are serialized and stored with the- mimetype set.-- The mimetype is used for serialized objects, and tells the- ResXResourceReader how to depersist the object. This is currently not- extensible. For a given mimetype the value must be set accordingly:-- Note - application/x-microsoft.net.object.binary.base64 is the format- that the ResXResourceWriter will generate, however the reader can- read any of the formats listed below.-- mimetype: application/x-microsoft.net.object.binary.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.soap.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.bytearray.base64- value : The object must be serialized into a byte array- : using a System.ComponentModel.TypeConverter- : and then encoded with base64 encoding.- -->- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />- <xsd:element name="root" msdata:IsDataSet="true">- <xsd:complexType>- <xsd:choice maxOccurs="unbounded">- <xsd:element name="metadata">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" />- </xsd:sequence>- <xsd:attribute name="name" use="required" type="xsd:string" />- <xsd:attribute name="type" type="xsd:string" />- <xsd:attribute name="mimetype" type="xsd:string" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="assembly">- <xsd:complexType>- <xsd:attribute name="alias" type="xsd:string" />- <xsd:attribute name="name" type="xsd:string" />- </xsd:complexType>- </xsd:element>- <xsd:element name="data">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="resheader">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" />- </xsd:complexType>- </xsd:element>- </xsd:choice>- </xsd:complexType>- </xsd:element>- </xsd:schema>- <resheader name="resmimetype">- <value>text/microsoft-resx</value>- </resheader>- <resheader name="version">- <value>2.0</value>- </resheader>- <resheader name="reader">- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <resheader name="writer">- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <data name="AccessibleName" xml:space="preserve">- <value>Color Blindness Simulator tool</value>- </data>- <data name="Description" xml:space="preserve">- <value>Simulate color blindness on a picture or screenshot</value>- </data>- <data name="DeuteranopiaSimulation" xml:space="preserve">- <value>Deuteranopia simulation</value>- </data>- <data name="InputOptionDescription" xml:space="preserve">- <value>Image file path to treat</value>- </data>- <data name="LongDisplayTitle" xml:space="preserve">- <value>Color Blindness Simulator</value>- </data>- <data name="OriginalPicture" xml:space="preserve">- <value>Original</value>- </data>- <data name="OutputDirectoryOptionDescription" xml:space="preserve">- <value>Directory where the result should be persisted. By default, use input file's directory</value>- </data>- <data name="ProtanopiaSimulation" xml:space="preserve">- <value>Protanopia simulation</value>- </data>- <data name="SearchKeywords" xml:space="preserve">- <value>Tritanopia Protanopia Deuteranopia Dalton Daltonism Daltonist</value>- <comment>Alternative search keywords.</comment>- </data>- <data name="ShortDisplayTitle" xml:space="preserve">- <value>Color Blindness Simulator</value>- </data>- <data name="SilentOptionDescription" xml:space="preserve">- <value>Hides the progress of the hashing operation</value>- </data>- <data name="TritanopiaSimulation" xml:space="preserve">- <value>Tritanopia simulation</value>- </data>-</root>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/Graphic/ColorBlindnessSimulator/ColorBlindnessSimulatorCommandLineTool.cs b/src/app/dev/DevToys.Tools/Tools/Graphic/ColorBlindnessSimulator/ColorBlindnessSimulatorCommandLineTool.csdeleted file mode 100644index 0d52f91ce..000000000--- a/src/app/dev/DevToys.Tools/Tools/Graphic/ColorBlindnessSimulator/ColorBlindnessSimulatorCommandLineTool.cs+++ /dev/null@@ -1,165 +0,0 @@-using DevToys.Tools.Helpers;-using DevToys.Tools.SmartDetection;-using DevToys.Tools.Strings.GlobalStrings;-using Microsoft.Extensions.Logging;-using SixLabors.ImageSharp;-using SixLabors.ImageSharp.PixelFormats;-using SixLabors.ImageSharp.Processing;--namespace DevToys.Tools.Tools.Graphic.ColorBlindnessSimulator;--[Export(typeof(ICommandLineTool))]-[Name("ColorBlindnessSimulator")]-[CommandName(- Name = "colorblindsimulator",- Alias = "cbs",- ResourceManagerBaseName = "DevToys.Tools.Tools.Graphic.ColorBlindnessSimulator.ColorBlindnessSimulator",- DescriptionResourceName = nameof(ColorBlindnessSimulator.Description))]-internal sealed class ColorBlindnessSimulatorCommandLineTool : ICommandLineTool-{- [CommandLineOption(- Name = "input",- Alias = "i",- IsRequired = true,- DescriptionResourceName = nameof(ColorBlindnessSimulator.InputOptionDescription))]- internal FileInfo Input { get; set; } = null!;-- [CommandLineOption(- Name = "outputDirectory",- Alias = "o",- DescriptionResourceName = nameof(ColorBlindnessSimulator.OutputDirectoryOptionDescription))]- internal DirectoryInfo? OutputFile { get; set; }-- [CommandLineOption(- Name = "silent",- Alias = "s",- DescriptionResourceName = nameof(ColorBlindnessSimulator.SilentOptionDescription))]- internal bool Silent { get; set; } = false;-- public async ValueTask<int> InvokeAsync(ILogger logger, CancellationToken cancellationToken)- {- if (Input is null)- {- return -1;- }-- if (!Input.Exists)- {- Console.Error.WriteLine(string.Format(GlobalStrings.FileNotFound, Input.FullName));- return -1;- }-- string fileExtension = Input.Extension;- bool isSupportedImageFile = StaticImageFileDataTypeDetector.SupportedFileTypes.Any(ext => ext.Equals(fileExtension, StringComparison.OrdinalIgnoreCase));- if (!isSupportedImageFile)- {- Console.Error.WriteLine(- string.Format(- GlobalStrings.FileTypeNotSupported,- Input.FullName,- string.Join(", ", StaticImageFileDataTypeDetector.SupportedFileTypes)));- return -1;- }-- await SimulateAsync(cancellationToken);-- return 0;- }-- private async Task SimulateAsync(CancellationToken cancellationToken)- {- string protanopiaOutputFilePath = string.Empty;- string tritanopiaOutputFilePath = string.Empty;- string deuteranopiaOutputFilePath = string.Empty;-- ConsoleProgressBar? progressBar = Silent ? null : new ConsoleProgressBar();- using (progressBar)- {- int protanopiaProgress = 0;- int tritanopiaProgress = 0;- int deuteranopiaProgress = 0;-- using Stream fileStream = Input.OpenRead();- using Image<Rgba32> originalImage = await Image.LoadAsync<Rgba32>(fileStream, cancellationToken);-- var simulationTasks- = new List<Task<Image<Rgba32>?>>- {- Task.Run(() =>- ColorBlindnessSimulatorHelper.SimulateColorBlindness(- originalImage,- ColorBlindnessMode.Protanopia,- (progress) =>- {- protanopiaProgress = progress;- UpdateProgress();- },- cancellationToken)),-- Task.Run(() =>- ColorBlindnessSimulatorHelper.SimulateColorBlindness(- originalImage,- ColorBlindnessMode.Tritanopia,- (progress) =>- {- tritanopiaProgress = progress;- UpdateProgress();- },- cancellationToken)),-- Task.Run(() =>- ColorBlindnessSimulatorHelper.SimulateColorBlindness(- originalImage,- ColorBlindnessMode.Deuteranopia,- (progress) =>- {- deuteranopiaProgress = progress;- UpdateProgress();- },- cancellationToken)),- };-- await Task.WhenAll(simulationTasks);-- using Image<Rgba32>? protanopiaImage = simulationTasks[0].Result;- using Image<Rgba32>? tritanopiaImage = simulationTasks[1].Result;- using Image<Rgba32>? deuteranopiaImage = simulationTasks[2].Result;-- string outputFileName = Path.GetFileNameWithoutExtension(Input.Name);- string outputDirectoryPath = OutputFile is null ? Path.GetDirectoryName(Input.FullName)! : OutputFile.FullName;- Directory.CreateDirectory(outputDirectoryPath);- string outputExtension = Path.GetExtension(Input.Name);-- protanopiaOutputFilePath = Path.Combine(outputDirectoryPath, outputFileName + "-protanopia" + outputExtension);- tritanopiaOutputFilePath = Path.Combine(outputDirectoryPath, outputFileName + "-tritanopia" + outputExtension);- deuteranopiaOutputFilePath = Path.Combine(outputDirectoryPath, outputFileName + "-deuteranopia" + outputExtension);-- if (protanopiaImage is not null)- {- progressBar?.Report(98);- await protanopiaImage.SaveAsync(protanopiaOutputFilePath, cancellationToken);- }-- if (tritanopiaImage is not null)- {- progressBar?.Report(99);- await tritanopiaImage.SaveAsync(tritanopiaOutputFilePath, cancellationToken);- }-- if (deuteranopiaImage is not null)- {- progressBar?.Report(100);- await deuteranopiaImage.SaveAsync(deuteranopiaOutputFilePath, cancellationToken);- }-- void UpdateProgress()- {- progressBar?.Report(Math.Min((protanopiaProgress + tritanopiaProgress + deuteranopiaProgress) / 3, 97));- }- }-- Console.WriteLine(protanopiaOutputFilePath);- Console.WriteLine(tritanopiaOutputFilePath);- Console.WriteLine(deuteranopiaOutputFilePath);- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Graphic/ColorBlindnessSimulator/ColorBlindnessSimulatorGuiTool.cs b/src/app/dev/DevToys.Tools/Tools/Graphic/ColorBlindnessSimulator/ColorBlindnessSimulatorGuiTool.csdeleted file mode 100644index fceb10b53..000000000--- a/src/app/dev/DevToys.Tools/Tools/Graphic/ColorBlindnessSimulator/ColorBlindnessSimulatorGuiTool.cs+++ /dev/null@@ -1,312 +0,0 @@-using DevToys.Tools.Helpers;-using DevToys.Tools.SmartDetection;-using Microsoft.Extensions.Logging;-using SixLabors.ImageSharp;-using SixLabors.ImageSharp.PixelFormats;-using SixLabors.ImageSharp.Processing;--namespace DevToys.Tools.Tools.Graphic.ColorBlindnessSimulator;--[Export(typeof(IGuiTool))]-[Name("ColorBlindnessSimulator")]-[ToolDisplayInformation(- IconFontName = "DevToys-Tools-Icons",- IconGlyph = '\u0101',- GroupName = PredefinedCommonToolGroupNames.Graphic,- ResourceManagerAssemblyIdentifier = nameof(DevToysToolsResourceManagerAssemblyIdentifier),- ResourceManagerBaseName = "DevToys.Tools.Tools.Graphic.ColorBlindnessSimulator.ColorBlindnessSimulator",- ShortDisplayTitleResourceName = nameof(ColorBlindnessSimulator.ShortDisplayTitle),- LongDisplayTitleResourceName = nameof(ColorBlindnessSimulator.LongDisplayTitle),- DescriptionResourceName = nameof(ColorBlindnessSimulator.Description),- SearchKeywordsResourceName = nameof(ColorBlindnessSimulator.SearchKeywords),- AccessibleNameResourceName = nameof(ColorBlindnessSimulator.AccessibleName))]-[AcceptedDataTypeName(PredefinedCommonDataTypeNames.Image)]-[AcceptedDataTypeName("StaticImageFile")]-internal sealed class ColorBlindnessSimulatorGuiTool : IGuiTool, IDisposable-{- private enum GridRows- {- FileInput,- FirstLineResult,- SecondLineResult- }-- private enum GridColumns- {- Left,- Right- }-- private readonly object _lock = new();- private readonly DisposableSemaphore _semaphore = new();- private readonly ILogger _logger;- private readonly IFileStorage _fileStorage;- private readonly IUIFileSelector _fileSelector = FileSelector();- private readonly IUIImageViewer _originalImageViewer = ImageViewer();- private readonly IUIImageViewer _protanopiaImageViewer = ImageViewer();- private readonly IUIImageViewer _tritanopiaImageViewer = ImageViewer();- private readonly IUIImageViewer _deuteranopiaImageViewer = ImageViewer();- private readonly IUIStack _progressStack = Stack();- private readonly IUIProgressBar _progressBar = ProgressBar();-- private CancellationTokenSource? _cancellationTokenSource;- private SandboxedFileReader? _selectedFile;-- [ImportingConstructor]- public ColorBlindnessSimulatorGuiTool(IFileStorage fileStorage)- {- _logger = this.Log();- _fileStorage = fileStorage;- }-- // For unit tests.- internal Task? WorkTask { get; private set; }-- public UIToolView View- => new(- isScrollable: false,- Grid()- .RowLargeSpacing()- .ColumnLargeSpacing()-- .Rows(- (GridRows.FileInput, Auto),- (GridRows.FirstLineResult, new UIGridLength(1, UIGridUnitType.Fraction)),- (GridRows.SecondLineResult, new UIGridLength(1, UIGridUnitType.Fraction)))-- .Columns(- (GridColumns.Left, new UIGridLength(1, UIGridUnitType.Fraction)),- (GridColumns.Right, new UIGridLength(1, UIGridUnitType.Fraction)))-- .Cells(- Cell(- GridRows.FileInput,- GridRows.FileInput,- GridColumns.Left,- GridColumns.Right,-- _fileSelector- .CanSelectOneFile()- .LimitFileTypesTo(StaticImageFileDataTypeDetector.SupportedFileTypes)- .OnFilesSelected(OnFilesSelected)),-- Cell(- GridRows.FirstLineResult,- GridColumns.Left,-- _originalImageViewer- .Title(ColorBlindnessSimulator.OriginalPicture)- .Hide()),-- Cell(- GridRows.FirstLineResult,- GridColumns.Right,-- _protanopiaImageViewer- .Title(ColorBlindnessSimulator.ProtanopiaSimulation)- .Hide()),-- Cell(- GridRows.SecondLineResult,- GridColumns.Left,-- _tritanopiaImageViewer- .Title(ColorBlindnessSimulator.TritanopiaSimulation)- .Hide()),-- Cell(- GridRows.SecondLineResult,- GridColumns.Right,-- _deuteranopiaImageViewer- .Title(ColorBlindnessSimulator.DeuteranopiaSimulation)- .Hide()),-- Cell(GridRows.FirstLineResult,- GridRows.SecondLineResult,- GridColumns.Left,- GridColumns.Right,-- _progressStack- .AlignHorizontally(UIHorizontalAlignment.Center)- .AlignVertically(UIVerticalAlignment.Center)- .Horizontal()- .SmallSpacing()- .Hide()-- .WithChildren(- _progressBar,- Button()- .Icon("FluentSystemIcons", '\uF75A')- .OnClick(CancelSimulation)))));-- public async void OnDataReceived(string dataTypeName, object? parsedData)- {- if (dataTypeName == PredefinedCommonDataTypeNames.Image && parsedData is Image<Rgba32> image)- {- FileInfo temporaryFile = _fileStorage.CreateSelfDestroyingTempFile("png");-- using (image)- {- using Stream fileStream = _fileStorage.OpenWriteFile(temporaryFile.FullName, replaceIfExist: true);- await image.SaveAsPngAsync(fileStream);- }-- _fileSelector.WithFiles(SandboxedFileReader.FromFileInfo(temporaryFile)); // This will trigger a new simulation.- }- else if (dataTypeName == "StaticImageFile" && parsedData is FileInfo file)- {- _fileSelector.WithFiles(SandboxedFileReader.FromFileInfo(file)); // This will trigger a new simulation.- }- }-- public void Dispose()- {- _selectedFile?.Dispose();- CancelSimulation();- _semaphore.Dispose();- }-- private void OnFilesSelected(SandboxedFileReader[] files)- {- Guard.HasSizeEqualTo(files, 1);-- _selectedFile?.Dispose();- _selectedFile = files[0];-- CancelSimulation();-- _cancellationTokenSource = new CancellationTokenSource();- WorkTask = SimulateAsync(_selectedFile, _cancellationTokenSource.Token);- }-- private void CancelSimulation()- {- lock (_lock)- {- try- {- _cancellationTokenSource?.Cancel();- }- catch- {- // Ignore.- }- finally- {- _cancellationTokenSource?.Dispose();- }-- _originalImageViewer.Clear();- _protanopiaImageViewer.Clear();- _tritanopiaImageViewer.Clear();- _deuteranopiaImageViewer.Clear();- _originalImageViewer.Hide();- _protanopiaImageViewer.Hide();- _tritanopiaImageViewer.Hide();- _deuteranopiaImageViewer.Hide();-- _progressBar.Progress(0);- _progressStack.Hide();- }- }-- private async Task SimulateAsync(SandboxedFileReader file, CancellationToken cancellationToken)- {- _progressStack.Show();-- int protanopiaProgress = 0;- int tritanopiaProgress = 0;- int deuteranopiaProgress = 0;-- using Stream fileStream = await file.GetNewAccessToFileContentAsync(cancellationToken);- Image<Rgba32> originalImage = await Image.LoadAsync<Rgba32>(fileStream, cancellationToken);-- var simulationTasks- = new List<Task<Image<Rgba32>?>>- {- SimulateAsync(- originalImage,- ColorBlindnessMode.Protanopia,- (progress) =>- {- protanopiaProgress = progress;- UpdateProgress();- },- cancellationToken),-- SimulateAsync(- originalImage,- ColorBlindnessMode.Tritanopia,- (progress) =>- {- tritanopiaProgress = progress;- UpdateProgress();- },- cancellationToken),-- SimulateAsync(- originalImage,- ColorBlindnessMode.Deuteranopia,- (progress) =>- {- deuteranopiaProgress = progress;- UpdateProgress();- },- cancellationToken),- };-- await Task.WhenAll(simulationTasks);-- lock (_lock)- {- _progressStack.Hide();-- if (cancellationToken.IsCancellationRequested)- {- if (simulationTasks[0].Result is not null)- {- simulationTasks[0].Result!.Dispose();- }- if (simulationTasks[1].Result is not null)- {- simulationTasks[1].Result!.Dispose();- }- if (simulationTasks[2].Result is not null)- {- simulationTasks[2].Result!.Dispose();- }-- return;- }-- Guard.IsNotNull(simulationTasks[0].Result);- Guard.IsNotNull(simulationTasks[1].Result);- Guard.IsNotNull(simulationTasks[2].Result);- Image<Rgba32> protanopiaImage = simulationTasks[0].Result!;- Image<Rgba32> tritanopiaImage = simulationTasks[1].Result!;- Image<Rgba32> deuteranopiaImage = simulationTasks[2].Result!;-- _originalImageViewer.WithImage(originalImage, disposeAutomatically: true).Show();- _protanopiaImageViewer.WithImage(protanopiaImage, disposeAutomatically: true).Show();- _tritanopiaImageViewer.WithImage(tritanopiaImage, disposeAutomatically: true).Show();- _deuteranopiaImageViewer.WithImage(deuteranopiaImage, disposeAutomatically: true).Show();- }-- void UpdateProgress()- {- _progressBar.Progress((protanopiaProgress + tritanopiaProgress + deuteranopiaProgress) / 3);- }- }-- private static async Task<Image<Rgba32>?> SimulateAsync(- Image<Rgba32> originalImage,- ColorBlindnessMode colorBlindnessMode,- Action<int> progressReport,- CancellationToken cancellationToken)- {- await TaskSchedulerAwaiter.SwitchOffMainThreadAsync(cancellationToken);-- return ColorBlindnessSimulatorHelper.SimulateColorBlindness(originalImage, colorBlindnessMode, progressReport, cancellationToken);- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Graphic/Graphic.Designer.cs b/src/app/dev/DevToys.Tools/Tools/Graphic/Graphic.Designer.csdeleted file mode 100644index f28323f4f..000000000--- a/src/app/dev/DevToys.Tools/Tools/Graphic/Graphic.Designer.cs+++ /dev/null@@ -1,81 +0,0 @@-//-------------------------------------------------------------------------------// <auto-generated>-// This code was generated by a tool.-// Runtime Version:4.0.30319.42000-//-// Changes to this file may cause incorrect behavior and will be lost if-// the code is regenerated.-// </auto-generated>-//--------------------------------------------------------------------------------namespace DevToys.Tools.Tools.Graphic {- using System;--- /// <summary>- /// A strongly-typed resource class, for looking up localized strings, etc.- /// </summary>- // This class was auto-generated by the StronglyTypedResourceBuilder- // class via a tool like ResGen or Visual Studio.- // To add or remove a member, edit your .ResX file then rerun ResGen- // with the /str option, or rebuild your VS project.- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]- internal class Graphic {-- private static global::System.Resources.ResourceManager resourceMan;-- private static global::System.Globalization.CultureInfo resourceCulture;-- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]- internal Graphic() {- }-- /// <summary>- /// Returns the cached ResourceManager instance used by this class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Resources.ResourceManager ResourceManager {- get {- if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Tools.Tools.Graphic.Graphic", typeof(Graphic).Assembly);- resourceMan = temp;- }- return resourceMan;- }- }-- /// <summary>- /// Overrides the current thread's CurrentUICulture property for all- /// resource lookups using this strongly typed resource class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Globalization.CultureInfo Culture {- get {- return resourceCulture;- }- set {- resourceCulture = value;- }- }-- /// <summary>- /// Looks up a localized string similar to Graphic.- /// </summary>- internal static string AccessibleName {- get {- return ResourceManager.GetString("AccessibleName", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Graphic.- /// </summary>- internal static string DisplayTitle {- get {- return ResourceManager.GetString("DisplayTitle", resourceCulture);- }- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Graphic/Graphic.resx b/src/app/dev/DevToys.Tools/Tools/Graphic/Graphic.resxdeleted file mode 100644index fa573fa90..000000000--- a/src/app/dev/DevToys.Tools/Tools/Graphic/Graphic.resx+++ /dev/null@@ -1,126 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<root>- <!--- Microsoft ResX Schema-- Version 2.0-- The primary goals of this format is to allow a simple XML format- that is mostly human readable. The generation and parsing of the- various data types are done through the TypeConverter classes- associated with the data types.-- Example:-- ... ado.net/XML headers & schema ...- <resheader name="resmimetype">text/microsoft-resx</resheader>- <resheader name="version">2.0</resheader>- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">- <value>[base64 mime encoded serialized .NET Framework object]</value>- </data>- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>- <comment>This is a comment</comment>- </data>-- There are any number of "resheader" rows that contain simple- name/value pairs.-- Each data row contains a name, and value. The row also contains a- type or mimetype. Type corresponds to a .NET class that support- text/value conversion through the TypeConverter architecture.- Classes that don't support this are serialized and stored with the- mimetype set.-- The mimetype is used for serialized objects, and tells the- ResXResourceReader how to depersist the object. This is currently not- extensible. For a given mimetype the value must be set accordingly:-- Note - application/x-microsoft.net.object.binary.base64 is the format- that the ResXResourceWriter will generate, however the reader can- read any of the formats listed below.-- mimetype: application/x-microsoft.net.object.binary.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.soap.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.bytearray.base64- value : The object must be serialized into a byte array- : using a System.ComponentModel.TypeConverter- : and then encoded with base64 encoding.- -->- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />- <xsd:element name="root" msdata:IsDataSet="true">- <xsd:complexType>- <xsd:choice maxOccurs="unbounded">- <xsd:element name="metadata">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" />- </xsd:sequence>- <xsd:attribute name="name" use="required" type="xsd:string" />- <xsd:attribute name="type" type="xsd:string" />- <xsd:attribute name="mimetype" type="xsd:string" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="assembly">- <xsd:complexType>- <xsd:attribute name="alias" type="xsd:string" />- <xsd:attribute name="name" type="xsd:string" />- </xsd:complexType>- </xsd:element>- <xsd:element name="data">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="resheader">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" />- </xsd:complexType>- </xsd:element>- </xsd:choice>- </xsd:complexType>- </xsd:element>- </xsd:schema>- <resheader name="resmimetype">- <value>text/microsoft-resx</value>- </resheader>- <resheader name="version">- <value>2.0</value>- </resheader>- <resheader name="reader">- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <resheader name="writer">- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <data name="AccessibleName" xml:space="preserve">- <value>Graphic</value>- </data>- <data name="DisplayTitle" xml:space="preserve">- <value>Graphic</value>- </data>-</root>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/Graphic/ImageConverter/ImageConverter.Designer.cs b/src/app/dev/DevToys.Tools/Tools/Graphic/ImageConverter/ImageConverter.Designer.csdeleted file mode 100644index 3cb3b6112..000000000--- a/src/app/dev/DevToys.Tools/Tools/Graphic/ImageConverter/ImageConverter.Designer.cs+++ /dev/null@@ -1,198 +0,0 @@-//-------------------------------------------------------------------------------// <auto-generated>-// This code was generated by a tool.-// Runtime Version:4.0.30319.42000-//-// Changes to this file may cause incorrect behavior and will be lost if-// the code is regenerated.-// </auto-generated>-//--------------------------------------------------------------------------------namespace DevToys.Tools.Tools.Graphic.ImageConverter {- using System;--- /// <summary>- /// A strongly-typed resource class, for looking up localized strings, etc.- /// </summary>- // This class was auto-generated by the StronglyTypedResourceBuilder- // class via a tool like ResGen or Visual Studio.- // To add or remove a member, edit your .ResX file then rerun ResGen- // with the /str option, or rebuild your VS project.- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]- internal class ImageConverter {-- private static global::System.Resources.ResourceManager resourceMan;-- private static global::System.Globalization.CultureInfo resourceCulture;-- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]- internal ImageConverter() {- }-- /// <summary>- /// Returns the cached ResourceManager instance used by this class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Resources.ResourceManager ResourceManager {- get {- if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Tools.Tools.Graphic.ImageConverter.ImageConverter", typeof(ImageConverter).Assembly);- resourceMan = temp;- }- return resourceMan;- }- }-- /// <summary>- /// Overrides the current thread's CurrentUICulture property for all- /// resource lookups using this strongly typed resource class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Globalization.CultureInfo Culture {- get {- return resourceCulture;- }- set {- resourceCulture = value;- }- }-- /// <summary>- /// Looks up a localized string similar to Image Converter tool.- /// </summary>- internal static string AccessibleName {- get {- return ResourceManager.GetString("AccessibleName", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Configuration.- /// </summary>- internal static string ConfigurationTitle {- get {- return ResourceManager.GetString("ConfigurationTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Conversion.- /// </summary>- internal static string ConversionTitle {- get {- return ResourceManager.GetString("ConversionTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Select the image format to convert into.- /// </summary>- internal static string ConvertedFormatDescription {- get {- return ResourceManager.GetString("ConvertedFormatDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Delete.- /// </summary>- internal static string Delete {- get {- return ResourceManager.GetString("Delete", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Delete all.- /// </summary>- internal static string DeleteAll {- get {- return ResourceManager.GetString("DeleteAll", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Lossless image converter.- /// </summary>- internal static string Description {- get {- return ResourceManager.GetString("Description", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to {0:0.##} {1}.- /// </summary>- internal static string FileSizeDisplay {- get {- return ResourceManager.GetString("FileSizeDisplay", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The format to convert images to.- /// </summary>- internal static string FormatOptionDescription {- get {- return ResourceManager.GetString("FormatOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to A set of image file paths or directories that contain images to convert.- /// </summary>- internal static string InputOptionDescription {- get {- return ResourceManager.GetString("InputOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Image Converter.- /// </summary>- internal static string LongDisplayTitle {- get {- return ResourceManager.GetString("LongDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Directory where the result should be saved, or a single file path, if the input is also a single file path..- /// </summary>- internal static string OutputDirectoryOptionDescription {- get {- return ResourceManager.GetString("OutputDirectoryOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Save all.- /// </summary>- internal static string SaveAll {- get {- return ResourceManager.GetString("SaveAll", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Save as.- /// </summary>- internal static string SaveAs {- get {- return ResourceManager.GetString("SaveAs", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Image Converter.- /// </summary>- internal static string ShortDisplayTitle {- get {- return ResourceManager.GetString("ShortDisplayTitle", resourceCulture);- }- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Graphic/ImageConverter/ImageConverter.resx b/src/app/dev/DevToys.Tools/Tools/Graphic/ImageConverter/ImageConverter.resxdeleted file mode 100644index 07bbdab38..000000000--- a/src/app/dev/DevToys.Tools/Tools/Graphic/ImageConverter/ImageConverter.resx+++ /dev/null@@ -1,166 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<root>- <!--- Microsoft ResX Schema-- Version 2.0-- The primary goals of this format is to allow a simple XML format- that is mostly human readable. The generation and parsing of the- various data types are done through the TypeConverter classes- associated with the data types.-- Example:-- ... ado.net/XML headers & schema ...- <resheader name="resmimetype">text/microsoft-resx</resheader>- <resheader name="version">2.0</resheader>- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">- <value>[base64 mime encoded serialized .NET Framework object]</value>- </data>- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>- <comment>This is a comment</comment>- </data>-- There are any number of "resheader" rows that contain simple- name/value pairs.-- Each data row contains a name, and value. The row also contains a- type or mimetype. Type corresponds to a .NET class that support- text/value conversion through the TypeConverter architecture.- Classes that don't support this are serialized and stored with the- mimetype set.-- The mimetype is used for serialized objects, and tells the- ResXResourceReader how to depersist the object. This is currently not- extensible. For a given mimetype the value must be set accordingly:-- Note - application/x-microsoft.net.object.binary.base64 is the format- that the ResXResourceWriter will generate, however the reader can- read any of the formats listed below.-- mimetype: application/x-microsoft.net.object.binary.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.soap.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.bytearray.base64- value : The object must be serialized into a byte array- : using a System.ComponentModel.TypeConverter- : and then encoded with base64 encoding.- -->- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />- <xsd:element name="root" msdata:IsDataSet="true">- <xsd:complexType>- <xsd:choice maxOccurs="unbounded">- <xsd:element name="metadata">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" />- </xsd:sequence>- <xsd:attribute name="name" use="required" type="xsd:string" />- <xsd:attribute name="type" type="xsd:string" />- <xsd:attribute name="mimetype" type="xsd:string" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="assembly">- <xsd:complexType>- <xsd:attribute name="alias" type="xsd:string" />- <xsd:attribute name="name" type="xsd:string" />- </xsd:complexType>- </xsd:element>- <xsd:element name="data">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="resheader">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" />- </xsd:complexType>- </xsd:element>- </xsd:choice>- </xsd:complexType>- </xsd:element>- </xsd:schema>- <resheader name="resmimetype">- <value>text/microsoft-resx</value>- </resheader>- <resheader name="version">- <value>2.0</value>- </resheader>- <resheader name="reader">- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <resheader name="writer">- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <data name="AccessibleName" xml:space="preserve">- <value>Image Converter tool</value>- </data>- <data name="ConfigurationTitle" xml:space="preserve">- <value>Configuration</value>- </data>- <data name="ConversionTitle" xml:space="preserve">- <value>Conversion</value>- </data>- <data name="ConvertedFormatDescription" xml:space="preserve">- <value>Select the image format to convert into</value>- </data>- <data name="Delete" xml:space="preserve">- <value>Delete</value>- </data>- <data name="DeleteAll" xml:space="preserve">- <value>Delete all</value>- </data>- <data name="Description" xml:space="preserve">- <value>Lossless image converter</value>- </data>- <data name="FileSizeDisplay" xml:space="preserve">- <value>{0:0.##} {1}</value>- <comment>{0} is a decimal number representing a file size. {1} is a unit, like Bytes, KB, MB, GB, TB</comment>- </data>- <data name="FormatOptionDescription" xml:space="preserve">- <value>The format to convert images to</value>- </data>- <data name="InputOptionDescription" xml:space="preserve">- <value>A set of image file paths or directories that contain images to convert</value>- </data>- <data name="LongDisplayTitle" xml:space="preserve">- <value>Image Converter</value>- </data>- <data name="OutputDirectoryOptionDescription" xml:space="preserve">- <value>Directory where the result should be saved, or a single file path, if the input is also a single file path.</value>- </data>- <data name="SaveAll" xml:space="preserve">- <value>Save all</value>- </data>- <data name="SaveAs" xml:space="preserve">- <value>Save as</value>- </data>- <data name="ShortDisplayTitle" xml:space="preserve">- <value>Image Converter</value>- </data>-</root>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/Graphic/ImageConverter/ImageConverterCommandLineTool.cs b/src/app/dev/DevToys.Tools/Tools/Graphic/ImageConverter/ImageConverterCommandLineTool.csdeleted file mode 100644index b8d2bf71d..000000000--- a/src/app/dev/DevToys.Tools/Tools/Graphic/ImageConverter/ImageConverterCommandLineTool.cs+++ /dev/null@@ -1,126 +0,0 @@-using DevToys.Tools.Helpers;-using DevToys.Tools.Models;-using DevToys.Tools.SmartDetection;-using Microsoft.Extensions.Logging;-using OneOf;-using SixLabors.ImageSharp;-using SixLabors.ImageSharp.PixelFormats;--namespace DevToys.Tools.Tools.Graphic.ImageConverter;--[Export(typeof(ICommandLineTool))]-[Name("ImageConverter")]-[CommandName(- Name = "imageconverter",- Alias = "imgconv",- ResourceManagerBaseName = "DevToys.Tools.Tools.Graphic.ImageConverter.ImageConverter",- DescriptionResourceName = nameof(ImageConverter.Description))]-internal sealed class ImageConverterCommandLineTool : ICommandLineTool-{- [CommandLineOption(- Name = "input",- Alias = "i",- IsRequired = true,- DescriptionResourceName = nameof(ImageConverter.InputOptionDescription))]- internal OneOf<DirectoryInfo, FileInfo>[] Input { get; set; } = null!;-- [CommandLineOption(- Name = "type",- Alias = "t",- IsRequired = true,- DescriptionResourceName = nameof(ImageConverter.FormatOptionDescription))]- internal ImageConverterSupportedFormat Format { get; set; }-- [CommandLineOption(- Name = "output",- Alias = "o",- DescriptionResourceName = nameof(ImageConverter.OutputDirectoryOptionDescription))]- internal OneOf<DirectoryInfo, FileInfo>? Output { get; set; }-- public async ValueTask<int> InvokeAsync(ILogger logger, CancellationToken cancellationToken)- {- try- {- if (Input is null || Input.Length == 0)- {- return -1;- }-- if (Input.Length >= 1)- {- if (Output.HasValue && Output.Value.IsT1)- {- Console.Error.WriteLine("Output must be a directory when passing more than one file as input.");- return -1;- }- }-- for (int i = 0; i < Input.Length; i++)- {- await TreatDirectoryOrFileAsync(Input[i], logger, cancellationToken);- }-- return 0;- }- catch (Exception ex) when (ex is TaskCanceledException or OperationCanceledException)- {- return -1;- }- catch- {- // TODO: Log exception.- return -1;- }- }-- private async Task TreatDirectoryOrFileAsync(OneOf<DirectoryInfo, FileInfo> directoryOrFile, ILogger logger, CancellationToken cancellationToken)- {- if (directoryOrFile.IsT0)- {- foreach (FileInfo fileInDirectory in directoryOrFile.AsT0.EnumerateFiles())- {- await TreatDirectoryOrFileAsync(fileInDirectory, logger, cancellationToken);- }- }- else if (directoryOrFile.IsT1)- {- cancellationToken.ThrowIfCancellationRequested();-- if (StaticImageFileDataTypeDetector.SupportedFileTypes.Contains(directoryOrFile.AsT1.Extension, StringComparer.OrdinalIgnoreCase))- {- await ConvertAsync(directoryOrFile.AsT1, cancellationToken);- }- }- }-- private async Task ConvertAsync(FileInfo fileToConvert, CancellationToken cancellationToken)- {- FileInfo outputFile;- if (!Output.HasValue || Output.Value.IsT0)- {- string outputDirectoryPath;- if (Output.HasValue)- {- outputDirectoryPath = Output.Value.AsT0.FullName;- }- else- {- outputDirectoryPath = Path.GetDirectoryName(fileToConvert.FullName)!;- }-- string outputFileName = Path.GetFileNameWithoutExtension(fileToConvert.FullName) + "." + Format.ToString().ToLower();- string outputFilePath = Path.Combine(outputDirectoryPath, outputFileName);- outputFile = new FileInfo(outputFilePath);- }- else- {- outputFile = Output.Value.AsT1;- }-- // Load the image first, in case if the user will overwrite it.- using Image<Rgba32> originalImage = await ImageHelper.LoadImageFromFileAsync(fileToConvert, cancellationToken);-- using FileStream outputFileStream = File.Create(outputFile.FullName);- await ImageHelper.SaveAsync(outputFileStream, originalImage, Format, cancellationToken);- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Graphic/ImageConverter/ImageConverterGuiTool.cs b/src/app/dev/DevToys.Tools/Tools/Graphic/ImageConverter/ImageConverterGuiTool.csdeleted file mode 100644index 335276dec..000000000--- a/src/app/dev/DevToys.Tools/Tools/Graphic/ImageConverter/ImageConverterGuiTool.cs+++ /dev/null@@ -1,219 +0,0 @@-using System.Collections.Specialized;-using DevToys.Tools.Models;-using DevToys.Tools.SmartDetection;-using Microsoft.Extensions.Logging;-using SixLabors.ImageSharp;-using SixLabors.ImageSharp.PixelFormats;--namespace DevToys.Tools.Tools.Graphic.ImageConverter;--[Export(typeof(IGuiTool))]-[Name("ImageConverter")]-[ToolDisplayInformation(- IconFontName = "DevToys-Tools-Icons",- IconGlyph = '\u0127',- GroupName = PredefinedCommonToolGroupNames.Graphic,- ResourceManagerAssemblyIdentifier = nameof(DevToysToolsResourceManagerAssemblyIdentifier),- ResourceManagerBaseName = "DevToys.Tools.Tools.Graphic.ImageConverter.ImageConverter",- ShortDisplayTitleResourceName = nameof(ImageConverter.ShortDisplayTitle),- LongDisplayTitleResourceName = nameof(ImageConverter.LongDisplayTitle),- DescriptionResourceName = nameof(ImageConverter.Description),- AccessibleNameResourceName = nameof(ImageConverter.AccessibleName))]-[AcceptedDataTypeName(PredefinedCommonDataTypeNames.Image)]-[AcceptedDataTypeName("StaticImageFile")]-[AcceptedDataTypeName("StaticImageFiles")]-internal sealed class ImageConverterGuiTool : IGuiTool, IDisposable-{- /// <summary>- /// The image format to convert into.- /// </summary>- private static readonly SettingDefinition<ImageConverterSupportedFormat> targetImageFormat- = new(- name: $"{nameof(ImageConverterGuiTool)}.{nameof(targetImageFormat)}",- defaultValue: ImageConverterSupportedFormat.PNG);-- private readonly ILogger _logger;- private readonly ISettingsProvider _settingsProvider;- private readonly IFileStorage _fileStorage;- private readonly IUIList _itemList = List("image-converter-task-list");- private readonly IUIButton _saveAllButton = Button("image-converter-save-all-button");- private readonly IUIButton _deleteAllButton = Button("image-converter-delete-all-button");-- [ImportingConstructor]- public ImageConverterGuiTool(ISettingsProvider settingsProvider, IFileStorage fileStorage)- {- _logger = this.Log();- _settingsProvider = settingsProvider;- _fileStorage = fileStorage;-- _itemList.Items.CollectionChanged += OnItemListItemsChanged;- }-- internal ImageConverterSupportedFormat UserSelectedImageFormat => _settingsProvider.GetSetting(targetImageFormat);-- internal IUIList ItemList => _itemList;-- public UIToolView View- => new(- isScrollable: true,- Stack()- .Vertical()- .LargeSpacing()-- .WithChildren(- Stack()- .Vertical()- .SmallSpacing()-- .WithChildren(- Label()- .Text(ImageConverter.ConfigurationTitle),-- Setting("image-converter-target-format-type-setting")- .Icon("FluentSystemIcons", '\uF18D')- .Title(ImageConverter.ConversionTitle)- .Description(ImageConverter.ConvertedFormatDescription)-- .Handle(- _settingsProvider,- targetImageFormat,- onOptionSelected: null,- Item(ImageConverterSupportedFormat.BMP),- Item(ImageConverterSupportedFormat.JPEG),- Item(ImageConverterSupportedFormat.PBM),- Item(ImageConverterSupportedFormat.PNG),- Item(ImageConverterSupportedFormat.TGA),- Item(ImageConverterSupportedFormat.TIFF),- Item(ImageConverterSupportedFormat.WEBP))),-- FileSelector()- .CanSelectManyFiles()- .LimitFileTypesTo(StaticImageFileDataTypeDetector.SupportedFileTypes)- .OnFilesSelected(OnFilesSelected),-- Stack()- .Horizontal()- .AlignHorizontally(UIHorizontalAlignment.Right)- .MediumSpacing()-- .WithChildren(- _saveAllButton- .Icon("FluentSystemIcons", '\uF67F')- .Text(ImageConverter.SaveAll)- .AccentAppearance()- .Disable()- .OnClick(OnSaveAllAsync),-- _deleteAllButton- .Icon("FluentSystemIcons", '\uF34C')- .Text(ImageConverter.DeleteAll)- .Disable()- .OnClick(OnDeleteAllAsync)),-- _itemList- .ForbidSelectItem()));-- public async void OnDataReceived(string dataTypeName, object? parsedData)- {- if (dataTypeName == PredefinedCommonDataTypeNames.Image && parsedData is Image<Rgba32> image)- {- FileInfo temporaryFile = _fileStorage.CreateSelfDestroyingTempFile("png");-- using (image)- {- using Stream fileStream = _fileStorage.OpenWriteFile(temporaryFile.FullName, replaceIfExist: true);- await image.SaveAsPngAsync(fileStream);- }-- _itemList.Items.Insert(0, new ImageConverterTaskItemGui(this, SandboxedFileReader.FromFileInfo(temporaryFile), _fileStorage));- }- else if (dataTypeName == "StaticImageFile" && parsedData is FileInfo file)- {- _itemList.Items.Insert(0, new ImageConverterTaskItemGui(this, SandboxedFileReader.FromFileInfo(file), _fileStorage));- }- else if (dataTypeName == "StaticImageFiles" && parsedData is FileInfo[] files)- {- for (int i = 0; i < files.Length; i++)- {- _itemList.Items.Insert(0, new ImageConverterTaskItemGui(this, SandboxedFileReader.FromFileInfo(files[i]), _fileStorage));- }- }- }-- public void Dispose()- {- for (int i = 0; i < _itemList.Items.Count; i++)- {- if (_itemList.Items[i] is IDisposable disposableItem)- {- disposableItem.Dispose();- }- }-- _itemList.Items.CollectionChanged -= OnItemListItemsChanged;- }-- private void OnFilesSelected(SandboxedFileReader[] files)- {- for (int i = 0; i < files.Length; i++)- {- _itemList.Items.Insert(- 0,- new ImageConverterTaskItemGui(this, files[i], _fileStorage));- }- }-- private async ValueTask OnSaveAllAsync()- {- string? folderPath = await _fileStorage.PickFolderAsync();-- if (!string.IsNullOrEmpty(folderPath))- {- ImageConverterSupportedFormat targetFormat = UserSelectedImageFormat;- for (int i = 0; i < _itemList.Items.Count; i++)- {- if (_itemList.Items[i] is ImageConverterTaskItemGui item)- {- string newFileName = Path.GetFileNameWithoutExtension(item.InputFile.FileName) + "." + targetFormat.ToString().ToLower();- string newFilePath = Path.Combine(folderPath, newFileName);- await item.SaveAsync(newFilePath, targetFormat);- }- }- }- }-- private ValueTask OnDeleteAllAsync()- {- for (int i = 0; i < _itemList.Items.Count; i++)- {- if (_itemList.Items[i] is IDisposable disposableItem)- {- disposableItem.Dispose();- }- }-- _itemList.Items.Clear();-- return ValueTask.CompletedTask;- }-- private void OnItemListItemsChanged(object? sender, NotifyCollectionChangedEventArgs e)- {- UpdateButtonsState();- }-- private void UpdateButtonsState()- {- bool hasItems = _itemList.Items.Count > 0;- if (hasItems)- {- _saveAllButton.Enable();- _deleteAllButton.Enable();- }- else- {- _saveAllButton.Disable();- _deleteAllButton.Disable();- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Graphic/ImageConverter/ImageConverterTaskItemGui.cs b/src/app/dev/DevToys.Tools/Tools/Graphic/ImageConverter/ImageConverterTaskItemGui.csdeleted file mode 100644index 528bb4fdb..000000000--- a/src/app/dev/DevToys.Tools/Tools/Graphic/ImageConverter/ImageConverterTaskItemGui.cs+++ /dev/null@@ -1,142 +0,0 @@-using DevToys.Tools.Helpers;-using DevToys.Tools.Models;-using DevToys.Tools.Strings.GlobalStrings;-using SixLabors.ImageSharp;-using SixLabors.ImageSharp.PixelFormats;--namespace DevToys.Tools.Tools.Graphic.ImageConverter;--internal sealed class ImageConverterTaskItemGui : IUIListItem, IDisposable-{- public static readonly string[] SizesStrings- = {- GlobalStrings.Bytes,- GlobalStrings.Kilobytes,- GlobalStrings.Megabytes,- GlobalStrings.Gigabytes,- GlobalStrings.Terabytes- };-- private enum GridRows- {- Top,- Bottom- }-- private enum GridColumns- {- Progress,- FileNameAndOriginalSize,- CompressedSize,- ActionButtons- }-- private readonly CancellationTokenSource _cancellationTokenSource = new CancellationTokenSource();- private readonly IFileStorage _fileStorage;- private readonly Lazy<IUIElement> _ui;- private readonly IUISetting _setting = Setting();- private readonly ImageConverterGuiTool _imageConverterGuiTool;-- internal ImageConverterTaskItemGui(ImageConverterGuiTool imageConverterGuiTool, SandboxedFileReader inputFile, IFileStorage fileStorage)- {- Guard.IsNotNull(imageConverterGuiTool);- Guard.IsNotNull(inputFile);- Guard.IsNotNull(fileStorage);-- _imageConverterGuiTool = imageConverterGuiTool;- _fileStorage = fileStorage;- Value = inputFile;- InputFile = inputFile;-- ComputePropertiesAsync().ForgetSafely();-- _ui- = new Lazy<IUIElement>(- _setting- .Icon("FluentSystemIcons", '\uF488')- .Title(inputFile.FileName)-- .InteractiveElement(- Stack()- .Horizontal()- .MediumSpacing()-- .WithChildren(- Stack()- .Horizontal()- .SmallSpacing()-- .WithChildren(- Button()- .Icon("FluentSystemIcons", '\uF67F')- .OnClick(OnSaveAsAsync),- Button()- .Icon("FluentSystemIcons", '\uF34C')- .OnClick(OnDeleteAsync)))));- }-- public IUIElement UIElement => _ui.Value;-- public object? Value { get; }-- internal SandboxedFileReader InputFile { get; }-- public void Dispose()- {- _cancellationTokenSource.Cancel();- _cancellationTokenSource.Dispose();- InputFile.Dispose();- }-- internal async Task SaveAsync(string filePath, ImageConverterSupportedFormat format)- {- using Image<Rgba32> originalImage = await ImageHelper.LoadImageFromFileAsync(InputFile, _cancellationTokenSource.Token);-- using FileStream outputFileStream = File.Create(filePath);- await ImageHelper.SaveAsync(outputFileStream, originalImage, format, _cancellationTokenSource.Token);- }-- private async ValueTask OnSaveAsAsync()- {- // Load the image first, in case if the user will overwrite it (so we can read it before PickSaveFileAsync opens an access to the file).- using Image<Rgba32> originalImage = await ImageHelper.LoadImageFromFileAsync(InputFile, _cancellationTokenSource.Token);-- // Ask the user to pick up a file.- Stream? outputFileStream = await _fileStorage.PickSaveFileAsync(_imageConverterGuiTool.UserSelectedImageFormat.ToString());- if (outputFileStream is not null)- {- await ImageHelper.SaveAsync(outputFileStream, originalImage, _imageConverterGuiTool.UserSelectedImageFormat, _cancellationTokenSource.Token);- }- }-- private ValueTask OnDeleteAsync()- {- _imageConverterGuiTool.ItemList.Items.Remove(this);- return ValueTask.CompletedTask;- }-- private async Task ComputePropertiesAsync()- {- await TaskSchedulerAwaiter.SwitchOffMainThreadAsync(_cancellationTokenSource.Token);-- using Stream fileStream = await InputFile.GetNewAccessToFileContentAsync(_cancellationTokenSource.Token);-- long storageFileSize = fileStream.Length;- string? fileSize = HumanizeFileSize(storageFileSize, ImageConverter.FileSizeDisplay);-- _setting.Description(fileSize);- }-- private static string HumanizeFileSize(double fileSize, string fileSizeDisplay)- {- int order = 0;- while (fileSize >= 1024 && order < SizesStrings.Length - 1)- {- order++;- fileSize /= 1024;- }-- string fileSizeString = string.Format(fileSizeDisplay, fileSize, SizesStrings[order]);- return fileSizeString;- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Testers/JsonPathTester/JsonPathTester.Designer.cs b/src/app/dev/DevToys.Tools/Tools/Testers/JsonPathTester/JsonPathTester.Designer.csdeleted file mode 100644index d15cec8bd..000000000--- a/src/app/dev/DevToys.Tools/Tools/Testers/JsonPathTester/JsonPathTester.Designer.cs+++ /dev/null@@ -1,315 +0,0 @@-//-------------------------------------------------------------------------------// <auto-generated>-// This code was generated by a tool.-// Runtime Version:4.0.30319.42000-//-// Changes to this file may cause incorrect behavior and will be lost if-// the code is regenerated.-// </auto-generated>-//--------------------------------------------------------------------------------namespace DevToys.Tools.Tools.Testers.JsonPathTester {- using System;--- /// <summary>- /// A strongly-typed resource class, for looking up localized strings, etc.- /// </summary>- // This class was auto-generated by the StronglyTypedResourceBuilder- // class via a tool like ResGen or Visual Studio.- // To add or remove a member, edit your .ResX file then rerun ResGen- // with the /str option, or rebuild your VS project.- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]- internal class JsonPathTester {-- private static global::System.Resources.ResourceManager resourceMan;-- private static global::System.Globalization.CultureInfo resourceCulture;-- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]- internal JsonPathTester() {- }-- /// <summary>- /// Returns the cached ResourceManager instance used by this class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Resources.ResourceManager ResourceManager {- get {- if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Tools.Tools.Testers.JsonPathTester.JsonPathTester", typeof(JsonPathTester).Assembly);- resourceMan = temp;- }- return resourceMan;- }- }-- /// <summary>- /// Overrides the current thread's CurrentUICulture property for all- /// resource lookups using this strongly typed resource class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Globalization.CultureInfo Culture {- get {- return resourceCulture;- }- set {- resourceCulture = value;- }- }-- /// <summary>- /// Looks up a localized string similar to JSONPath Tester tool.- /// </summary>- internal static string AccessibleName {- get {- return ResourceManager.GetString("AccessibleName", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Array slice operator.- /// </summary>- internal static string CheatSheetArraySliceOperator {- get {- return ResourceManager.GetString("CheatSheetArraySliceOperator", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Bracket-notated child or children.- /// </summary>- internal static string CheatSheetBracketNotedChildOperator {- get {- return ResourceManager.GetString("CheatSheetBracketNotedChildOperator", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Used for filter expressions. Refers to the current node for further processing..- /// </summary>- internal static string CheatSheetCurrentObjectElement {- get {- return ResourceManager.GetString("CheatSheetCurrentObjectElement", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Description.- /// </summary>- internal static string CheatSheetDescription {- get {- return ResourceManager.GetString("CheatSheetDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Dot-notated child.- /// </summary>- internal static string CheatSheetDotNotedChildOperator {- get {- return ResourceManager.GetString("CheatSheetDotNotedChildOperator", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Selects all elements in an object or array that match the specified boolean expression. Returns a list..- /// </summary>- internal static string CheatSheetFilterExpression {- get {- return ResourceManager.GetString("CheatSheetFilterExpression", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Performs a deep scan for the specified property in all available objects. Always returns a list, even for a single match..- /// </summary>- internal static string CheatSheetRecursiveDescent {- get {- return ResourceManager.GetString("CheatSheetRecursiveDescent", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The root object or array..- /// </summary>- internal static string CheatSheetRootObjectElement {- get {- return ResourceManager.GetString("CheatSheetRootObjectElement", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Script expression..- /// </summary>- internal static string CheatSheetScriptExpression {- get {- return ResourceManager.GetString("CheatSheetScriptExpression", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Selects the n-th element from an array. Indexes start from 0..- /// </summary>- internal static string CheatSheetSubscriptOperator {- get {- return ResourceManager.GetString("CheatSheetSubscriptOperator", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Syntax.- /// </summary>- internal static string CheatSheetSyntax {- get {- return ResourceManager.GetString("CheatSheetSyntax", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Cheat sheet.- /// </summary>- internal static string CheatSheetTitle {- get {- return ResourceManager.GetString("CheatSheetTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Selects n1 and n2 array items. Returns a list..- /// </summary>- internal static string CheatSheetUnionOperator {- get {- return ResourceManager.GetString("CheatSheetUnionOperator", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Wildcard. Selects all elements in an object or array, regardless of their names or indexes..- /// </summary>- internal static string CheatSheetWildcard {- get {- return ResourceManager.GetString("CheatSheetWildcard", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Test a JSONPath.- /// </summary>- internal static string Description {- get {- return ResourceManager.GetString("Description", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Input file selected doesn't exist..- /// </summary>- internal static string InputFileNotFound {- get {- return ResourceManager.GetString("InputFileNotFound", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Text or path to a file containing the JSON.- /// </summary>- internal static string InputJsonOptionDescription {- get {- return ResourceManager.GetString("InputJsonOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Text or path to a file containing the JSONPath.- /// </summary>- internal static string InputJsonPathOptionDescription {- get {- return ResourceManager.GetString("InputJsonPathOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to JSONPath.- /// </summary>- internal static string InputJsonPathTitle {- get {- return ResourceManager.GetString("InputJsonPathTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to JSON.- /// </summary>- internal static string InputTitle {- get {- return ResourceManager.GetString("InputTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Please specify an input text or an input file.- /// </summary>- internal static string InvalidInputOrFileCommand {- get {- return ResourceManager.GetString("InvalidInputOrFileCommand", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to JSONPath Tester.- /// </summary>- internal static string LongDisplayTitle {- get {- return ResourceManager.GetString("LongDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to No match found.- /// </summary>- internal static string NoMatchFound {- get {- return ResourceManager.GetString("NoMatchFound", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Test result.- /// </summary>- internal static string Output {- get {- return ResourceManager.GetString("Output", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Path to the output file.- /// </summary>- internal static string OutputFileOptionDescription {- get {- return ResourceManager.GetString("OutputFileOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to path json.- /// </summary>- internal static string SearchKeywords {- get {- return ResourceManager.GetString("SearchKeywords", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to JSONPath.- /// </summary>- internal static string ShortDisplayTitle {- get {- return ResourceManager.GetString("ShortDisplayTitle", resourceCulture);- }- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Testers/JsonPathTester/JsonPathTester.resx b/src/app/dev/DevToys.Tools/Tools/Testers/JsonPathTester/JsonPathTester.resxdeleted file mode 100644index ca03424e6..000000000--- a/src/app/dev/DevToys.Tools/Tools/Testers/JsonPathTester/JsonPathTester.resx+++ /dev/null@@ -1,204 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<root>- <!--- Microsoft ResX Schema-- Version 2.0-- The primary goals of this format is to allow a simple XML format- that is mostly human readable. The generation and parsing of the- various data types are done through the TypeConverter classes- associated with the data types.-- Example:-- ... ado.net/XML headers & schema ...- <resheader name="resmimetype">text/microsoft-resx</resheader>- <resheader name="version">2.0</resheader>- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">- <value>[base64 mime encoded serialized .NET Framework object]</value>- </data>- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>- <comment>This is a comment</comment>- </data>-- There are any number of "resheader" rows that contain simple- name/value pairs.-- Each data row contains a name, and value. The row also contains a- type or mimetype. Type corresponds to a .NET class that support- text/value conversion through the TypeConverter architecture.- Classes that don't support this are serialized and stored with the- mimetype set.-- The mimetype is used for serialized objects, and tells the- ResXResourceReader how to depersist the object. This is currently not- extensible. For a given mimetype the value must be set accordingly:-- Note - application/x-microsoft.net.object.binary.base64 is the format- that the ResXResourceWriter will generate, however the reader can- read any of the formats listed below.-- mimetype: application/x-microsoft.net.object.binary.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.soap.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.bytearray.base64- value : The object must be serialized into a byte array- : using a System.ComponentModel.TypeConverter- : and then encoded with base64 encoding.- -->- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />- <xsd:element name="root" msdata:IsDataSet="true">- <xsd:complexType>- <xsd:choice maxOccurs="unbounded">- <xsd:element name="metadata">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" />- </xsd:sequence>- <xsd:attribute name="name" use="required" type="xsd:string" />- <xsd:attribute name="type" type="xsd:string" />- <xsd:attribute name="mimetype" type="xsd:string" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="assembly">- <xsd:complexType>- <xsd:attribute name="alias" type="xsd:string" />- <xsd:attribute name="name" type="xsd:string" />- </xsd:complexType>- </xsd:element>- <xsd:element name="data">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="resheader">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" />- </xsd:complexType>- </xsd:element>- </xsd:choice>- </xsd:complexType>- </xsd:element>- </xsd:schema>- <resheader name="resmimetype">- <value>text/microsoft-resx</value>- </resheader>- <resheader name="version">- <value>2.0</value>- </resheader>- <resheader name="reader">- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <resheader name="writer">- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <data name="AccessibleName" xml:space="preserve">- <value>JSONPath Tester tool</value>- </data>- <data name="CheatSheetArraySliceOperator" xml:space="preserve">- <value>Array slice operator</value>- </data>- <data name="CheatSheetBracketNotedChildOperator" xml:space="preserve">- <value>Bracket-notated child or children</value>- </data>- <data name="CheatSheetCurrentObjectElement" xml:space="preserve">- <value>Used for filter expressions. Refers to the current node for further processing.</value>- </data>- <data name="CheatSheetDescription" xml:space="preserve">- <value>Description</value>- </data>- <data name="CheatSheetDotNotedChildOperator" xml:space="preserve">- <value>Dot-notated child</value>- </data>- <data name="CheatSheetFilterExpression" xml:space="preserve">- <value>Selects all elements in an object or array that match the specified boolean expression. Returns a list.</value>- </data>- <data name="CheatSheetRecursiveDescent" xml:space="preserve">- <value>Performs a deep scan for the specified property in all available objects. Always returns a list, even for a single match.</value>- </data>- <data name="CheatSheetRootObjectElement" xml:space="preserve">- <value>The root object or array.</value>- </data>- <data name="CheatSheetScriptExpression" xml:space="preserve">- <value>Script expression.</value>- </data>- <data name="CheatSheetSubscriptOperator" xml:space="preserve">- <value>Selects the n-th element from an array. Indexes start from 0.</value>- </data>- <data name="CheatSheetSyntax" xml:space="preserve">- <value>Syntax</value>- </data>- <data name="CheatSheetTitle" xml:space="preserve">- <value>Cheat sheet</value>- </data>- <data name="CheatSheetUnionOperator" xml:space="preserve">- <value>Selects n1 and n2 array items. Returns a list.</value>- </data>- <data name="CheatSheetWildcard" xml:space="preserve">- <value>Wildcard. Selects all elements in an object or array, regardless of their names or indexes.</value>- </data>- <data name="Description" xml:space="preserve">- <value>Test a JSONPath</value>- </data>- <data name="InputFileNotFound" xml:space="preserve">- <value>Input file selected doesn't exist.</value>- </data>- <data name="InputJsonOptionDescription" xml:space="preserve">- <value>Text or path to a file containing the JSON</value>- </data>- <data name="InputJsonPathOptionDescription" xml:space="preserve">- <value>Text or path to a file containing the JSONPath</value>- </data>- <data name="InputJsonPathTitle" xml:space="preserve">- <value>JSONPath</value>- </data>- <data name="InputTitle" xml:space="preserve">- <value>JSON</value>- </data>- <data name="InvalidInputOrFileCommand" xml:space="preserve">- <value>Please specify an input text or an input file</value>- </data>- <data name="LongDisplayTitle" xml:space="preserve">- <value>JSONPath Tester</value>- </data>- <data name="NoMatchFound" xml:space="preserve">- <value>No match found</value>- </data>- <data name="Output" xml:space="preserve">- <value>Test result</value>- </data>- <data name="OutputFileOptionDescription" xml:space="preserve">- <value>Path to the output file</value>- </data>- <data name="SearchKeywords" xml:space="preserve">- <value>path json</value>- </data>- <data name="ShortDisplayTitle" xml:space="preserve">- <value>JSONPath</value>- </data>-</root>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/Testers/JsonPathTester/JsonPathTesterCommandLineTool.cs b/src/app/dev/DevToys.Tools/Tools/Testers/JsonPathTester/JsonPathTesterCommandLineTool.csdeleted file mode 100644index 19216fc48..000000000--- a/src/app/dev/DevToys.Tools/Tools/Testers/JsonPathTester/JsonPathTesterCommandLineTool.cs+++ /dev/null@@ -1,82 +0,0 @@-using DevToys.Tools.Helpers;-using Microsoft.Extensions.Logging;-using OneOf;--namespace DevToys.Tools.Tools.Testers.JsonPathTester;--[Export(typeof(ICommandLineTool))]-[Name("JSONPathTester")]-[CommandName(- Name = "jsonpathtester",- Alias = "jpt",- ResourceManagerBaseName = "DevToys.Tools.Tools.Testers.JsonPathTester.JsonPathTester",- DescriptionResourceName = nameof(JsonPathTester.Description))]-internal sealed class JsonPathTesterCommandLineTool : ICommandLineTool-{-#pragma warning disable IDE0044 // Add readonly modifier- [Import]- private IFileStorage _fileStorage = null!;-#pragma warning restore IDE0044 // Add readonly modifier-- [CommandLineOption(- Name = "json",- Alias = "j",- IsRequired = true,- DescriptionResourceName = nameof(JsonPathTester.InputJsonOptionDescription))]- internal OneOf<FileInfo, string>? InputJson { get; set; }-- [CommandLineOption(- Name = "path",- Alias = "p",- IsRequired = true,- DescriptionResourceName = nameof(JsonPathTester.InputJsonPathOptionDescription))]- internal OneOf<FileInfo, string>? InputJsonPath { get; set; }-- [CommandLineOption(- Name = "outputFile",- Alias = "o",- DescriptionResourceName = nameof(JsonPathTester.OutputFileOptionDescription))]- internal FileInfo? OutputFile { get; set; }-- public async ValueTask<int> InvokeAsync(ILogger logger, CancellationToken cancellationToken)- {- if (!InputJson.HasValue || !InputJsonPath.HasValue)- {- Console.Error.WriteLine(JsonPathTester.InvalidInputOrFileCommand);- return -1;- }-- ResultInfo<string> inputJson = await InputJson.Value.ReadAllTextAsync(_fileStorage, cancellationToken);- if (!inputJson.HasSucceeded)- {- Console.Error.WriteLine(JsonPathTester.InputFileNotFound);- return -1;- }-- ResultInfo<string> inputJsonPath = await InputJsonPath.Value.ReadAllTextAsync(_fileStorage, cancellationToken);- if (!inputJsonPath.HasSucceeded)- {- Console.Error.WriteLine(JsonPathTester.InputFileNotFound);- return -1;- }-- Guard.IsNotNull(inputJson.Data);- Guard.IsNotNull(inputJsonPath.Data);- ResultInfo<string> formatResult = await JsonHelper.TestJsonPathAsync(- inputJson.Data,- inputJsonPath.Data,- logger,- cancellationToken);-- cancellationToken.ThrowIfCancellationRequested();-- if (!formatResult.HasSucceeded)- {- Console.Error.WriteLine(formatResult.Data);- return -1;- }-- await FileHelper.WriteOutputAsync(formatResult.Data, OutputFile, cancellationToken);- return 0;- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Testers/JsonPathTester/JsonPathTesterGuiTool.cs b/src/app/dev/DevToys.Tools/Tools/Testers/JsonPathTester/JsonPathTesterGuiTool.csdeleted file mode 100644index 05784b7d3..000000000--- a/src/app/dev/DevToys.Tools/Tools/Testers/JsonPathTester/JsonPathTesterGuiTool.cs+++ /dev/null@@ -1,223 +0,0 @@-using DevToys.Tools.Helpers;-using Microsoft.Extensions.Logging;-using Newtonsoft.Json;-using Newtonsoft.Json.Linq;--namespace DevToys.Tools.Tools.Testers.JsonPathTester;--[Export(typeof(IGuiTool))]-[Name("JSONPathTester")]-[ToolDisplayInformation(- IconFontName = "DevToys-Tools-Icons",- IconGlyph = '\u0108', // TODO: Create an icon for this tool- GroupName = PredefinedCommonToolGroupNames.Testers,- ResourceManagerAssemblyIdentifier = nameof(DevToysToolsResourceManagerAssemblyIdentifier),- ResourceManagerBaseName = "DevToys.Tools.Tools.Testers.JsonPathTester.JsonPathTester",- ShortDisplayTitleResourceName = nameof(JsonPathTester.ShortDisplayTitle),- LongDisplayTitleResourceName = nameof(JsonPathTester.LongDisplayTitle),- DescriptionResourceName = nameof(JsonPathTester.Description),- AccessibleNameResourceName = nameof(JsonPathTester.AccessibleName),- SearchKeywordsResourceName = nameof(JsonPathTester.SearchKeywords))]-[AcceptedDataTypeName(PredefinedCommonDataTypeNames.Json)]-internal sealed class JsonPathTesterGuiTool : IGuiTool, IDisposable-{- private static readonly IUIDataGridRow[] cheatSheetRows- = new[]- {- CreateCheatSheetRow(@"$", JsonPathTester.CheatSheetRootObjectElement),- CreateCheatSheetRow(@"@", JsonPathTester.CheatSheetCurrentObjectElement),- CreateCheatSheetRow(@"object.property", JsonPathTester.CheatSheetDotNotedChildOperator),- CreateCheatSheetRow(@"['object'].['property']", JsonPathTester.CheatSheetBracketNotedChildOperator),- CreateCheatSheetRow(@"..property", JsonPathTester.CheatSheetRecursiveDescent),- CreateCheatSheetRow(@"*", JsonPathTester.CheatSheetWildcard),- CreateCheatSheetRow(@"[n]", JsonPathTester.CheatSheetSubscriptOperator),- CreateCheatSheetRow(@"[n1,n2]", JsonPathTester.CheatSheetUnionOperator),- CreateCheatSheetRow(@"[start:end:step]", JsonPathTester.CheatSheetArraySliceOperator),- CreateCheatSheetRow(@"?(expression)", JsonPathTester.CheatSheetFilterExpression),- CreateCheatSheetRow(@"(expression)", JsonPathTester.CheatSheetScriptExpression)- };-- private enum GridRows- {- TopAuto,- Stretch,- }-- private enum GridColumns- {- Stretch- }-- private readonly DisposableSemaphore _semaphore = new();- private readonly ILogger _logger;- private readonly ISettingsProvider _settingsProvider;- private readonly IUIMultiLineTextInput _inputJson = MultilineTextInput("input-json-json-path-tester");- private readonly IUISingleLineTextInput _inputJsonPath = SingleLineTextInput("input-json-path-json-path-tester");- private readonly IUIMultiLineTextInput _outputJson = MultilineTextInput("output-json-path-tester");-- private CancellationTokenSource? _cancellationTokenSource;- private string _lastTreatedInputJson = string.Empty;- private JObject? _inputJsonObjectBackup = null;-- [ImportingConstructor]- public JsonPathTesterGuiTool(ISettingsProvider settingsProvider)- {- _logger = this.Log();- _settingsProvider = settingsProvider;- }-- // For unit tests.- internal Task? WorkTask { get; private set; }-- public UIToolView View- => new(- isScrollable: false,- SplitGrid()- .Vertical()- .LeftPaneLength(new UIGridLength(1, UIGridUnitType.Fraction))- .RightPaneLength(new UIGridLength(1, UIGridUnitType.Fraction))-- .WithLeftPaneChild(- _inputJson- .Title(JsonPathTester.InputTitle)- .Language("json")- .OnTextChanged(OnInputJsonChanged))-- .WithRightPaneChild(- SplitGrid()- .Horizontal()-- .WithTopPaneChild(- Grid()- .ColumnSmallSpacing()-- .Rows(- (GridRows.TopAuto, Auto),- (GridRows.Stretch, new UIGridLength(1, UIGridUnitType.Fraction)))-- .Columns(- (GridColumns.Stretch, new UIGridLength(1, UIGridUnitType.Fraction)))-- .Cells(- Cell(- GridRows.TopAuto,- GridColumns.Stretch,-- _inputJsonPath- .Title(JsonPathTester.InputJsonPathTitle)- .OnTextChanged(OnInputJsonPathChanged)),-- Cell(- GridRows.Stretch,- GridColumns.Stretch,-- _outputJson- .ReadOnly()- .Extendable()- .Language("json")- .Title(JsonPathTester.Output))))-- .WithBottomPaneChild(- DataGrid()- .Title(JsonPathTester.CheatSheetTitle)- .Extendable()- .WithColumns(JsonPathTester.CheatSheetSyntax, JsonPathTester.CheatSheetDescription)- .WithRows(cheatSheetRows))));-- public void OnDataReceived(string dataTypeName, object? parsedData)- {- if (dataTypeName == PredefinedCommonDataTypeNames.Json && parsedData is string json)- {- _inputJson.Text(json);- }- }-- public void Dispose()- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _semaphore.Dispose();- }-- private void OnInputJsonChanged(string json)- {- StartTest();- }-- private void OnInputJsonPathChanged(string jsonPath)- {- StartTest();- }-- private void StartTest()- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _cancellationTokenSource = new CancellationTokenSource();-- WorkTask = TestJsonPathAsync(_inputJson.Text, _inputJsonPath.Text, _cancellationTokenSource.Token);- }-- private async Task TestJsonPathAsync(string json, string jsonPath, CancellationToken cancellationToken)- {- using (await _semaphore.WaitAsync(cancellationToken))- {- await TaskSchedulerAwaiter.SwitchOffMainThreadAsync(cancellationToken);-- string result = JsonPathTester.NoMatchFound;- try- {- if (!string.IsNullOrWhiteSpace(jsonPath))- {- if (string.Equals(_lastTreatedInputJson, json, StringComparison.Ordinal))- {- // We can reuse the previous JObject. Let's avoid parsing it too often to improve performance.- _inputJsonObjectBackup ??= JObject.Parse(json);- }- else- {- // We need to parse the new JObject.- _inputJsonObjectBackup = JObject.Parse(json);- _lastTreatedInputJson = json;- }-- cancellationToken.ThrowIfCancellationRequested();-- JObject jsonObject = _inputJsonObjectBackup;-- ResultInfo<string> resultInfo = JsonHelper.TestJsonPath(jsonObject, jsonPath, _logger, cancellationToken);- if (resultInfo.HasSucceeded)- {- result = resultInfo.Data;- }- }- }- catch (Exception ex) when (ex is OperationCanceledException or JsonReaderException)- {- // Ignore- }- catch (Exception ex)- {- _logger.LogError(ex, "Error while testing JsonPath.");- }- finally- {- _outputJson.Text(result);- }- }- }-- private static IUIDataGridRow CreateCheatSheetRow(string syntax, string description)- => Row(- null,- details: null,- Cell(- Label()- .NeverWrap()- .Style(UILabelStyle.BodyStrong)- .Text($"\t{syntax}\t")),- Cell(- Label()- .NeverWrap()- .Text(description)));-}diff --git a/src/app/dev/DevToys.Tools/Tools/Testers/RegExTester/README.md b/src/app/dev/DevToys.Tools/Tools/Testers/RegExTester/README.mddeleted file mode 100644index daea5073c..000000000--- a/src/app/dev/DevToys.Tools/Tools/Testers/RegExTester/README.md+++ /dev/null@@ -1 +0,0 @@-There's no command line tool for Regex. `grep` (Unix) and `findstr` (Windows) are popular and good enough as alternative.\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/Testers/RegExTester/RegExTester.Designer.cs b/src/app/dev/DevToys.Tools/Tools/Testers/RegExTester/RegExTester.Designer.csdeleted file mode 100644index 231956ead..000000000--- a/src/app/dev/DevToys.Tools/Tools/Testers/RegExTester/RegExTester.Designer.cs+++ /dev/null@@ -1,1800 +0,0 @@-//-------------------------------------------------------------------------------// <auto-generated>-// This code was generated by a tool.-// Runtime Version:4.0.30319.42000-//-// Changes to this file may cause incorrect behavior and will be lost if-// the code is regenerated.-// </auto-generated>-//--------------------------------------------------------------------------------namespace DevToys.Tools.Tools.Testers.RegExTester {- using System;--- /// <summary>- /// A strongly-typed resource class, for looking up localized strings, etc.- /// </summary>- // This class was auto-generated by the StronglyTypedResourceBuilder- // class via a tool like ResGen or Visual Studio.- // To add or remove a member, edit your .ResX file then rerun ResGen- // with the /str option, or rebuild your VS project.- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]- internal class RegExTester {-- private static global::System.Resources.ResourceManager resourceMan;-- private static global::System.Globalization.CultureInfo resourceCulture;-- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]- internal RegExTester() {- }-- /// <summary>- /// Returns the cached ResourceManager instance used by this class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Resources.ResourceManager ResourceManager {- get {- if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Tools.Tools.Testers.RegExTester.RegExTester", typeof(RegExTester).Assembly);- resourceMan = temp;- }- return resourceMan;- }- }-- /// <summary>- /// Overrides the current thread's CurrentUICulture property for all- /// resource lookups using this strongly typed resource class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Globalization.CultureInfo Culture {- get {- return resourceCulture;- }- set {- resourceCulture = value;- }- }-- /// <summary>- /// Looks up a localized string similar to Regular Expression Tester tool.- /// </summary>- internal static string AccessibleName {- get {- return ResourceManager.GetString("AccessibleName", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to All matches.- /// </summary>- internal static string AllMatches {- get {- return ResourceManager.GetString("AllMatches", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Find all the matches in the text or stop after the first match..- /// </summary>- internal static string AllMatchesDescription {- get {- return ResourceManager.GetString("AllMatchesDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Alternation.- /// </summary>- internal static string CheatSheetAlternation {- get {- return ResourceManager.GetString("CheatSheetAlternation", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Acts like a boolean OR. Matches the expression before or after the |.- ///It can operate within a group, or on a whole expression. The patterns will be tested in order..- /// </summary>- internal static string CheatSheetAlternationDetails {- get {- return ResourceManager.GetString("CheatSheetAlternationDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Any character except newline.- /// </summary>- internal static string CheatSheetAnyCharacter {- get {- return ResourceManager.GetString("CheatSheetAnyCharacter", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches any character other than newline. Equivalent to [^\n\r]..- /// </summary>- internal static string CheatSheetAnyCharacterDetails {- get {- return ResourceManager.GetString("CheatSheetAnyCharacterDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Atomic group.- /// </summary>- internal static string CheatSheetAtomicGroup {- get {- return ResourceManager.GetString("CheatSheetAtomicGroup", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Non-capturing group that discards backtracking positions once matched.- ///For example, /(?>ab|a)b/ will match abb but not ab because once the ab option has matched, the atomic group prevents backtracking to retry with the a option..- /// </summary>- internal static string CheatSheetAtomicGroupDetails {- get {- return ResourceManager.GetString("CheatSheetAtomicGroupDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Beginning.- /// </summary>- internal static string CheatSheetBeginning {- get {- return ResourceManager.GetString("CheatSheetBeginning", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches the beginning of the string, or the beginning of a line if the multiline flag (m) is enabled. This matches a position, not a character..- /// </summary>- internal static string CheatSheetBeginningDetails {- get {- return ResourceManager.GetString("CheatSheetBeginningDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Beginning of string.- /// </summary>- internal static string CheatSheetBeginningOfString {- get {- return ResourceManager.GetString("CheatSheetBeginningOfString", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches the beginning of the string. Unlike ^, this is unaffected by the multiline flag (m). This matches a position, not a character..- /// </summary>- internal static string CheatSheetBeginningOfStringDetails {- get {- return ResourceManager.GetString("CheatSheetBeginningOfStringDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Bell.- /// </summary>- internal static string CheatSheetBell {- get {- return ResourceManager.GetString("CheatSheetBell", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches a BELL character (char code 7)..- /// </summary>- internal static string CheatSheetBellDetails {- get {- return ResourceManager.GetString("CheatSheetBellDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Branch reset group.- /// </summary>- internal static string CheatSheetBranchResetGroup {- get {- return ResourceManager.GetString("CheatSheetBranchResetGroup", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Define alternative groups that share the same group numbers.- ///For example, in (?|(a)|(b)) both groups (a and b) would be counted as group #1..- /// </summary>- internal static string CheatSheetBranchResetGroupDetails {- get {- return ResourceManager.GetString("CheatSheetBranchResetGroupDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Capture group.- /// </summary>- internal static string CheatSheetCaptureGroup {- get {- return ResourceManager.GetString("CheatSheetCaptureGroup", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Inserts the results of the specified capture group. For example, $3 would insert the third capture group.- ///There are multiple syntaxes for this feature:- ///- ///$1 \1 \{1}.- /// </summary>- internal static string CheatSheetCaptureGroupDetails {- get {- return ResourceManager.GetString("CheatSheetCaptureGroupDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Capturing group.- /// </summary>- internal static string CheatSheetCapturingGroup {- get {- return ResourceManager.GetString("CheatSheetCapturingGroup", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Groups multiple tokens together and creates a capture group for extracting a substring or using a backreference..- /// </summary>- internal static string CheatSheetCapturingGroupDetails {- get {- return ResourceManager.GetString("CheatSheetCapturingGroupDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Carriage return.- /// </summary>- internal static string CheatSheetCarriageReturn {- get {- return ResourceManager.GetString("CheatSheetCarriageReturn", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches a CARRIAGE RETURN character (char code 13)..- /// </summary>- internal static string CheatSheetCarriageReturnDetails {- get {- return ResourceManager.GetString("CheatSheetCarriageReturnDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Anchors.- /// </summary>- internal static string CheatSheetCategoryAnchors {- get {- return ResourceManager.GetString("CheatSheetCategoryAnchors", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Character classes.- /// </summary>- internal static string CheatSheetCategoryCharacterClasses {- get {- return ResourceManager.GetString("CheatSheetCategoryCharacterClasses", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Escaped characters.- /// </summary>- internal static string CheatSheetCategoryEscapedCharacters {- get {- return ResourceManager.GetString("CheatSheetCategoryEscapedCharacters", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Groups and References.- /// </summary>- internal static string CheatSheetCategoryGroupsReferences {- get {- return ResourceManager.GetString("CheatSheetCategoryGroupsReferences", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Lookaround.- /// </summary>- internal static string CheatSheetCategoryLookaround {- get {- return ResourceManager.GetString("CheatSheetCategoryLookaround", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Quantifiers and Alternation.- /// </summary>- internal static string CheatSheetCategoryQuantifiersAlternation {- get {- return ResourceManager.GetString("CheatSheetCategoryQuantifiersAlternation", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Special.- /// </summary>- internal static string CheatSheetCategorySpecial {- get {- return ResourceManager.GetString("CheatSheetCategorySpecial", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Substitution.- /// </summary>- internal static string CheatSheetCategorySubstitution {- get {- return ResourceManager.GetString("CheatSheetCategorySubstitution", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Character range.- /// </summary>- internal static string CheatSheetCharacterRange {- get {- return ResourceManager.GetString("CheatSheetCharacterRange", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches a character having a character code between the two specified characters inclusive..- /// </summary>- internal static string CheatSheetCharacterRangeDetails {- get {- return ResourceManager.GetString("CheatSheetCharacterRangeDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to A single character of A, b or c.- /// </summary>- internal static string CheatSheetCharacterSet {- get {- return ResourceManager.GetString("CheatSheetCharacterSet", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches either an A, b or c character.- /// </summary>- internal static string CheatSheetCharacterSetDetails {- get {- return ResourceManager.GetString("CheatSheetCharacterSetDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Comment.- /// </summary>- internal static string CheatSheetComment {- get {- return ResourceManager.GetString("CheatSheetComment", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Allows you to insert a comment into your expression that is ignored when finding a match..- /// </summary>- internal static string CheatSheetCommentDetails {- get {- return ResourceManager.GetString("CheatSheetCommentDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Conditional.- /// </summary>- internal static string CheatSheetConditional {- get {- return ResourceManager.GetString("CheatSheetConditional", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Conditionally matches one of two options based on whether a lookaround is matched.- ///For example, /(?(?=a)ab|..)/ will match ab and zx but not ax, because if the first character matches the condition a then it evaluates the pattern ab.- ///- ///Any lookaround can be used as the condition. A lookahead will start the subsequent match at the start of the condition, a lookbehind will start it after..- /// </summary>- internal static string CheatSheetConditionalDetails {- get {- return ResourceManager.GetString("CheatSheetConditionalDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Control character escape.- /// </summary>- internal static string CheatSheetControlCharacterEscape {- get {- return ResourceManager.GetString("CheatSheetControlCharacterEscape", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Escaped control character in the form \cZ. This can range from \cA (SOH, char code 1) to \cZ (SUB, char code 26)..- /// </summary>- internal static string CheatSheetControlCharacterEscapeDetails {- get {- return ResourceManager.GetString("CheatSheetControlCharacterEscapeDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Define.- /// </summary>- internal static string CheatSheetDefine {- get {- return ResourceManager.GetString("CheatSheetDefine", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Used to define named groups for use as subroutines without including them in the match.- ///For example, /A(?(DEFINE)(?'foo'Z))B\g'foo'/ will match ABZ, because the define group is ignored in the match except to define the foo subroutine that is referenced later with \g'foo'..- /// </summary>- internal static string CheatSheetDefineDetails {- get {- return ResourceManager.GetString("CheatSheetDefineDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Description.- /// </summary>- internal static string CheatSheetDescription {- get {- return ResourceManager.GetString("CheatSheetDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Digit.- /// </summary>- internal static string CheatSheetDigit {- get {- return ResourceManager.GetString("CheatSheetDigit", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches any digit character (0-9). Equivalent to [0-9]..- /// </summary>- internal static string CheatSheetDigitDetails {- get {- return ResourceManager.GetString("CheatSheetDigitDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to End.- /// </summary>- internal static string CheatSheetEnd {- get {- return ResourceManager.GetString("CheatSheetEnd", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches the end of the string, or the end of a line if the multiline flag (m) is enabled. This matches a position, not a character..- /// </summary>- internal static string CheatSheetEndDetails {- get {- return ResourceManager.GetString("CheatSheetEndDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to End of string.- /// </summary>- internal static string CheatSheetEndOfString {- get {- return ResourceManager.GetString("CheatSheetEndOfString", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches the end of the string. Unlike $, this is unaffected by the multiline flag (m). This matches a position, not a character..- /// </summary>- internal static string CheatSheetEndOfStringDetails {- get {- return ResourceManager.GetString("CheatSheetEndOfStringDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Esc.- /// </summary>- internal static string CheatSheetEsc {- get {- return ResourceManager.GetString("CheatSheetEsc", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Escaped characters.- /// </summary>- internal static string CheatSheetEscapedCharacters {- get {- return ResourceManager.GetString("CheatSheetEscapedCharacters", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to For convenience, these escaped characters are supported in the Replace string in RegExr: \n, \r, \t, \\, and unicode escapes \uFFFF. This may vary in your deploy environment..- /// </summary>- internal static string CheatSheetEscapedCharactersDetails {- get {- return ResourceManager.GetString("CheatSheetEscapedCharactersDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Escape sequence.- /// </summary>- internal static string CheatSheetEscapeSequence {- get {- return ResourceManager.GetString("CheatSheetEscapeSequence", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to All characters between the \Q and the \E are interpreted as a literal string. If \E is omitted, it continues to the end of the expression. For example, the expression /\Q(?.)\E/ will match the string (?.)..- /// </summary>- internal static string CheatSheetEscapeSequenceDetails {- get {- return ResourceManager.GetString("CheatSheetEscapeSequenceDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches a ESC character (char code 27)..- /// </summary>- internal static string CheatSheetEscDetails {- get {- return ResourceManager.GetString("CheatSheetEscDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Form feed.- /// </summary>- internal static string CheatSheetFormFeed {- get {- return ResourceManager.GetString("CheatSheetFormFeed", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches a FORM FEED character (char code 12)..- /// </summary>- internal static string CheatSheetFormFeedDetails {- get {- return ResourceManager.GetString("CheatSheetFormFeedDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Group conditional.- /// </summary>- internal static string CheatSheetGroupConditional {- get {- return ResourceManager.GetString("CheatSheetGroupConditional", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Conditionally matches one of two options based on whether group 'undefined' matched.- ///For example, /(z)?(?(1)a|b)/ will match za because the first capture group matches z successfully, which causes the conditional to match the first option a.- ///- ///The same pattern will also match b on its own, because group 1 doesn't match, so it instead tries to match the second option b.- ///- ///You can reference a group by name, number, or relative position (ex. -1)..- /// </summary>- internal static string CheatSheetGroupConditionalDetails {- get {- return ResourceManager.GetString("CheatSheetGroupConditionalDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Hexadecimal escape.- /// </summary>- internal static string CheatSheetHexadecimalEscape {- get {- return ResourceManager.GetString("CheatSheetHexadecimalEscape", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Hexadecimal escaped character in the form \xFF..- /// </summary>- internal static string CheatSheetHexadecimalEscapeDetails {- get {- return ResourceManager.GetString("CheatSheetHexadecimalEscapeDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Horizontal whitespace.- /// </summary>- internal static string CheatSheetHorizontalWhitespace {- get {- return ResourceManager.GetString("CheatSheetHorizontalWhitespace", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches any horizontal whitespace character (spaces, tabs)..- /// </summary>- internal static string CheatSheetHorizontalWhitespaceDetails {- get {- return ResourceManager.GetString("CheatSheetHorizontalWhitespaceDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Keep out.- /// </summary>- internal static string CheatSheetKeepOut {- get {- return ResourceManager.GetString("CheatSheetKeepOut", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Keep text matched so far out of the returned match, essentially discarding the match up to this point.For example /o\Kbar/ will match bar within the string foobar.- /// </summary>- internal static string CheatSheetKeepOutDetails {- get {- return ResourceManager.GetString("CheatSheetKeepOutDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Lazy.- /// </summary>- internal static string CheatSheetLazy {- get {- return ResourceManager.GetString("CheatSheetLazy", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Makes the preceding quantifier lazy, causing it to match as few characters as possible. By default, quantifiers are greedy, and will match as many characters as possible.- ///This behaviour is reversed by the ungreedy (U) flag/modifier..- /// </summary>- internal static string CheatSheetLazyDetails {- get {- return ResourceManager.GetString("CheatSheetLazyDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Line break.- /// </summary>- internal static string CheatSheetLineBreak {- get {- return ResourceManager.GetString("CheatSheetLineBreak", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches any line break character, including the CRLF pair, and CR / LF individually..- /// </summary>- internal static string CheatSheetLineBreakDetails {- get {- return ResourceManager.GetString("CheatSheetLineBreakDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Line feed.- /// </summary>- internal static string CheatSheetLineFeed {- get {- return ResourceManager.GetString("CheatSheetLineFeed", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches a LINE FEED character (char code 10)..- /// </summary>- internal static string CheatSheetLineFeedDetails {- get {- return ResourceManager.GetString("CheatSheetLineFeedDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Match.- /// </summary>- internal static string CheatSheetMatch {- get {- return ResourceManager.GetString("CheatSheetMatch", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Match any.- /// </summary>- internal static string CheatSheetMatchAny {- get {- return ResourceManager.GetString("CheatSheetMatchAny", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to A character set that can be used to match any character, including line breaks, without the dotall flag (s)..- /// </summary>- internal static string CheatSheetMatchAnyDetails {- get {- return ResourceManager.GetString("CheatSheetMatchAnyDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Inserts the matched text.- ///There are multiple syntaxes for this feature:- ///- ///$0 \0 \{0}.- /// </summary>- internal static string CheatSheetMatchDetails {- get {- return ResourceManager.GetString("CheatSheetMatchDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Mode modifier.- /// </summary>- internal static string CheatSheetModeModifier {- get {- return ResourceManager.GetString("CheatSheetModeModifier", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Enables or disables modes for the remainder of the expression.Matching modes generally map to expression flags. For example (?i) would enable case insensitivity for the remainder of the expression.- ///Multiple modifiers can be specified, and any modifiers that follow - are disabled. For example (?im-s) would enable case insensitivity & multiline modes, and disable dotall.- ///- ///Supported modifiers are: i - case insensitive, s - dotall, m - multiline, x - free spacing, J - allow duplicate names, U - ungreedy..- /// </summary>- internal static string CheatSheetModeModifierDetails {- get {- return ResourceManager.GetString("CheatSheetModeModifierDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Named capturing group.- /// </summary>- internal static string CheatSheetNamedCapturingGroup {- get {- return ResourceManager.GetString("CheatSheetNamedCapturingGroup", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Creates a capturing group that can be referenced via the specified name.- ///There are multiple syntaxes for this feature:- ///- ///(?'name'ABC) (?P<name>ABC) (?<name>ABC).- /// </summary>- internal static string CheatSheetNamedCapturingGroupDetails {- get {- return ResourceManager.GetString("CheatSheetNamedCapturingGroupDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Named reference.- /// </summary>- internal static string CheatSheetNamedReference {- get {- return ResourceManager.GetString("CheatSheetNamedReference", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches the results of a named capture group.- ///There are multiple syntaxes for this feature:- ///- ///\k'name' \k<name> \k{name} \g{name} (?P=name).- /// </summary>- internal static string CheatSheetNamedReferenceDetails {- get {- return ResourceManager.GetString("CheatSheetNamedReferenceDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Named subroutine.- /// </summary>- internal static string CheatSheetNamedSubroutine {- get {- return ResourceManager.GetString("CheatSheetNamedSubroutine", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches the expression in a capture group. Compare this to a reference, that matches the result.- ///There are multiple syntaxes for this feature: \g<name> \g'name' (?&name) (?P>name)..- /// </summary>- internal static string CheatSheetNamedSubroutineDetails {- get {- return ResourceManager.GetString("CheatSheetNamedSubroutineDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to A character except A, b or c.- /// </summary>- internal static string CheatSheetNegatedCharacterSet {- get {- return ResourceManager.GetString("CheatSheetNegatedCharacterSet", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Match any character that is not A, b or c..- /// </summary>- internal static string CheatSheetNegatedCharacterSetDetails {- get {- return ResourceManager.GetString("CheatSheetNegatedCharacterSetDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Negative lookahead.- /// </summary>- internal static string CheatSheetNegativeLookahead {- get {- return ResourceManager.GetString("CheatSheetNegativeLookahead", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Specifies a group that can not match after the main expression (if it matches, the result is discarded)..- /// </summary>- internal static string CheatSheetNegativeLookaheadDetails {- get {- return ResourceManager.GetString("CheatSheetNegativeLookaheadDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Negative lookbehind.- /// </summary>- internal static string CheatSheetNegativeLookbehind {- get {- return ResourceManager.GetString("CheatSheetNegativeLookbehind", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Specifies a group that can not match before the main expression (if it matches, the result is discarded)..- /// </summary>- internal static string CheatSheetNegativeLookbehindDetails {- get {- return ResourceManager.GetString("CheatSheetNegativeLookbehindDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Non-capturing group.- /// </summary>- internal static string CheatSheetNonCapturingGroup {- get {- return ResourceManager.GetString("CheatSheetNonCapturingGroup", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Groups multiple tokens together without creating a capture group..- /// </summary>- internal static string CheatSheetNonCapturingGroupDetails {- get {- return ResourceManager.GetString("CheatSheetNonCapturingGroupDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Not digit.- /// </summary>- internal static string CheatSheetNotDigit {- get {- return ResourceManager.GetString("CheatSheetNotDigit", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches any character that is not a digit character (0-9). Equivalent to [^0-9]..- /// </summary>- internal static string CheatSheetNotDigitDetails {- get {- return ResourceManager.GetString("CheatSheetNotDigitDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Not horizontal whitespace.- /// </summary>- internal static string CheatSheetNotHorizontalWhitespace {- get {- return ResourceManager.GetString("CheatSheetNotHorizontalWhitespace", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches any character that is not a horizontal whitespace character (spaces, tabs)..- /// </summary>- internal static string CheatSheetNotHorizontalWhitespaceDetails {- get {- return ResourceManager.GetString("CheatSheetNotHorizontalWhitespaceDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Not line break.- /// </summary>- internal static string CheatSheetNotLineBreak {- get {- return ResourceManager.GetString("CheatSheetNotLineBreak", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches any character that is not a line break. Similar to dot (.) but is unaffected by the dotall flag (s)..- /// </summary>- internal static string CheatSheetNotLineBreakDetails {- get {- return ResourceManager.GetString("CheatSheetNotLineBreakDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Not unicode category.- /// </summary>- internal static string CheatSheetNotUnicodeCategory {- get {- return ResourceManager.GetString("CheatSheetNotUnicodeCategory", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches any character that is not in the specified unicode category..- /// </summary>- internal static string CheatSheetNotUnicodeCategoryDetails {- get {- return ResourceManager.GetString("CheatSheetNotUnicodeCategoryDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Not unicode script.- /// </summary>- internal static string CheatSheetNotUnicodeScript {- get {- return ResourceManager.GetString("CheatSheetNotUnicodeScript", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches any character that is not in the specified unicode script..- /// </summary>- internal static string CheatSheetNotUnicodeScriptDetails {- get {- return ResourceManager.GetString("CheatSheetNotUnicodeScriptDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Not vertical whitespace.- /// </summary>- internal static string CheatSheetNotVerticalWhitespace {- get {- return ResourceManager.GetString("CheatSheetNotVerticalWhitespace", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches any character that is not a vertical whitespace character (line breaks)..- /// </summary>- internal static string CheatSheetNotVerticalWhitespaceDetails {- get {- return ResourceManager.GetString("CheatSheetNotVerticalWhitespaceDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Not whitespace.- /// </summary>- internal static string CheatSheetNotWhitespace {- get {- return ResourceManager.GetString("CheatSheetNotWhitespace", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches any character that is not a whitespace character (spaces, tabs, line breaks)..- /// </summary>- internal static string CheatSheetNotWhitespaceDetails {- get {- return ResourceManager.GetString("CheatSheetNotWhitespaceDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Not word.- /// </summary>- internal static string CheatSheetNotWord {- get {- return ResourceManager.GetString("CheatSheetNotWord", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Not word boundary.- /// </summary>- internal static string CheatSheetNotWordBoundary {- get {- return ResourceManager.GetString("CheatSheetNotWordBoundary", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches any position that is not a word boundary. This matches a position, not a character..- /// </summary>- internal static string CheatSheetNotWordBoundaryDetails {- get {- return ResourceManager.GetString("CheatSheetNotWordBoundaryDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches any character that is not a word character (alphanumeric & underscore). Equivalent to [^A-Za-z0-9_].- /// </summary>- internal static string CheatSheetNotWordDetails {- get {- return ResourceManager.GetString("CheatSheetNotWordDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Null.- /// </summary>- internal static string CheatSheetNull {- get {- return ResourceManager.GetString("CheatSheetNull", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches a NULL character (char code 0)..- /// </summary>- internal static string CheatSheetNullDetails {- get {- return ResourceManager.GetString("CheatSheetNullDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Numeric reference.- /// </summary>- internal static string CheatSheetNumericReference {- get {- return ResourceManager.GetString("CheatSheetNumericReference", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches the results of a capture group. For example \1 matches the results of the first capture group & \3 matches the third.- ///There are multiple syntaxes for this feature: \1 \g1 \g{1}.- ///- ///The latter syntaxes support relative values preceded by + or -. For example \g-1 would match the group preceding the reference..- /// </summary>- internal static string CheatSheetNumericReferenceDetails {- get {- return ResourceManager.GetString("CheatSheetNumericReferenceDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Numeric subroutine.- /// </summary>- internal static string CheatSheetNumericSubroutine {- get {- return ResourceManager.GetString("CheatSheetNumericSubroutine", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches the expression in a capture group. Compare this to a reference, that matches the result. For example /(a|b)\g'1'/ can match ab, because the expression a|b is evaluated again.- ///There are multiple syntaxes for this feature: \g<1> \g'1' (?1).- ///- ///Relative values preceded by + or - are also supported. For example \g<-1> would match the group preceding the reference..- /// </summary>- internal static string CheatSheetNumericSubroutineDetails {- get {- return ResourceManager.GetString("CheatSheetNumericSubroutineDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Octal escape.- /// </summary>- internal static string CheatSheetOctalEscape {- get {- return ResourceManager.GetString("CheatSheetOctalEscape", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Octal escaped character in the form \000. Value must be less than 255 (\377).- ///The syntax \o{FFF} is also supported..- /// </summary>- internal static string CheatSheetOctalEscapeDetails {- get {- return ResourceManager.GetString("CheatSheetOctalEscapeDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Optional.- /// </summary>- internal static string CheatSheetOptional {- get {- return ResourceManager.GetString("CheatSheetOptional", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches 0 or 1 of the preceding token, effectively making it optional..- /// </summary>- internal static string CheatSheetOptionalDetails {- get {- return ResourceManager.GetString("CheatSheetOptionalDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Plus.- /// </summary>- internal static string CheatSheetPlus {- get {- return ResourceManager.GetString("CheatSheetPlus", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches 1 or more of the preceding token..- /// </summary>- internal static string CheatSheetPlusDetails {- get {- return ResourceManager.GetString("CheatSheetPlusDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Positive lookahead.- /// </summary>- internal static string CheatSheetPositiveLookahead {- get {- return ResourceManager.GetString("CheatSheetPositiveLookahead", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches a group after the main expression without including it in the result..- /// </summary>- internal static string CheatSheetPositiveLookaheadDetails {- get {- return ResourceManager.GetString("CheatSheetPositiveLookaheadDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Positive lookbehind.- /// </summary>- internal static string CheatSheetPositiveLookbehind {- get {- return ResourceManager.GetString("CheatSheetPositiveLookbehind", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches a group before the main expression without including it in the result..- /// </summary>- internal static string CheatSheetPositiveLookbehindDetails {- get {- return ResourceManager.GetString("CheatSheetPositiveLookbehindDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Possessive.- /// </summary>- internal static string CheatSheetPossessive {- get {- return ResourceManager.GetString("CheatSheetPossessive", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Makes the preceding quantifier possessive. It will match as many characters as possible, and will not release them to match subsequent tokens.- ///For example /.*a/ would match aaa, but /.*+a/ would not, because the repeating dot would match and not release the last character to match a..- /// </summary>- internal static string CheatSheetPossessiveDetails {- get {- return ResourceManager.GetString("CheatSheetPossessiveDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Previous match end.- /// </summary>- internal static string CheatSheetPreviousMatchEnd {- get {- return ResourceManager.GetString("CheatSheetPreviousMatchEnd", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches the end position of the previous match. This matches a position, not a character..- /// </summary>- internal static string CheatSheetPreviousMatchEndDetails {- get {- return ResourceManager.GetString("CheatSheetPreviousMatchEndDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Quantifier.- /// </summary>- internal static string CheatSheetQuantifier {- get {- return ResourceManager.GetString("CheatSheetQuantifier", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches the specified quantity of the previous token. {1,3} will match 1 to 3. {3} will match exactly 3. {3,} will match 3 or more..- /// </summary>- internal static string CheatSheetQuantifierDetails {- get {- return ResourceManager.GetString("CheatSheetQuantifierDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Recursion.- /// </summary>- internal static string CheatSheetRecursion {- get {- return ResourceManager.GetString("CheatSheetRecursion", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Attempts to match the full expression again at the current position.- ///For example, /a(?R)?b/ will match any number of a followed by the same number of z: the full text of az or aaaazzzz, but not azzz.- ///- ///There are multiple syntaxes for this feature:- ///- ///(?R) (?0) \g<0> \g'0'.- /// </summary>- internal static string CheatSheetRecursionDetails {- get {- return ResourceManager.GetString("CheatSheetRecursionDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Reserved characters.- /// </summary>- internal static string CheatSheetReservedCharacters {- get {- return ResourceManager.GetString("CheatSheetReservedCharacters", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to The following character have special meaning, and should be preceded by a \ (backslash) to represent a literal character:- ///+*?^$\.[]{}()|/- ///- ///Within a character set, only \, -, and ] need to be escaped..- /// </summary>- internal static string CheatSheetReservedCharactersDetails {- get {- return ResourceManager.GetString("CheatSheetReservedCharactersDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Star.- /// </summary>- internal static string CheatSheetStar {- get {- return ResourceManager.GetString("CheatSheetStar", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches 0 or more of the preceding token..- /// </summary>- internal static string CheatSheetStarDetails {- get {- return ResourceManager.GetString("CheatSheetStarDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Strict end of string.- /// </summary>- internal static string CheatSheetStrictEndOfString {- get {- return ResourceManager.GetString("CheatSheetStrictEndOfString", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches the end of the string. Unlike $ or \Z, it does not allow for a trailing newline. This is unaffected by the multiline flag (m). This matches a position, not a character..- /// </summary>- internal static string CheatSheetStrictEndOfStringDetails {- get {- return ResourceManager.GetString("CheatSheetStrictEndOfStringDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Syntax.- /// </summary>- internal static string CheatSheetSyntax {- get {- return ResourceManager.GetString("CheatSheetSyntax", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Tab.- /// </summary>- internal static string CheatSheetTab {- get {- return ResourceManager.GetString("CheatSheetTab", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches a TAB character (char code 9)..- /// </summary>- internal static string CheatSheetTabDetails {- get {- return ResourceManager.GetString("CheatSheetTabDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Cheat sheet.- /// </summary>- internal static string CheatSheetTitle {- get {- return ResourceManager.GetString("CheatSheetTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Unicode category.- /// </summary>- internal static string CheatSheetUnicodeCategory {- get {- return ResourceManager.GetString("CheatSheetUnicodeCategory", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches a character in the specified unicode category. For example, \p{Ll} will match any lowercase letter..- /// </summary>- internal static string CheatSheetUnicodeCategoryDetails {- get {- return ResourceManager.GetString("CheatSheetUnicodeCategoryDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Unicode escape.- /// </summary>- internal static string CheatSheetUnicodeEscape {- get {- return ResourceManager.GetString("CheatSheetUnicodeEscape", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Unicode escaped character in the form \x{FF}..- /// </summary>- internal static string CheatSheetUnicodeEscapeDetails {- get {- return ResourceManager.GetString("CheatSheetUnicodeEscapeDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Unicode grapheme.- /// </summary>- internal static string CheatSheetUnicodeGrapheme {- get {- return ResourceManager.GetString("CheatSheetUnicodeGrapheme", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches any single unicode grapheme (ie. character). This includes line breaks (regardless of the dotall mode) and graphemes encoded as multiple code points..- /// </summary>- internal static string CheatSheetUnicodeGraphemeDetails {- get {- return ResourceManager.GetString("CheatSheetUnicodeGraphemeDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Unicode script.- /// </summary>- internal static string CheatSheetUnicodeScript {- get {- return ResourceManager.GetString("CheatSheetUnicodeScript", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches any character in the specified unicode script. For example, \p{Arabic} will match characters in the Arabic script..- /// </summary>- internal static string CheatSheetUnicodeScriptDetails {- get {- return ResourceManager.GetString("CheatSheetUnicodeScriptDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Vertical whitespace.- /// </summary>- internal static string CheatSheetVerticalWhitespace {- get {- return ResourceManager.GetString("CheatSheetVerticalWhitespace", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches any vertical whitespace character (line breaks)..- /// </summary>- internal static string CheatSheetVerticalWhitespaceDetails {- get {- return ResourceManager.GetString("CheatSheetVerticalWhitespaceDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Whitespace.- /// </summary>- internal static string CheatSheetWhitespace {- get {- return ResourceManager.GetString("CheatSheetWhitespace", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches any whitespace character (spaces, tabs, line breaks)..- /// </summary>- internal static string CheatSheetWhitespaceDetails {- get {- return ResourceManager.GetString("CheatSheetWhitespaceDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Word.- /// </summary>- internal static string CheatSheetWord {- get {- return ResourceManager.GetString("CheatSheetWord", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Word boundary.- /// </summary>- internal static string CheatSheetWordBoundary {- get {- return ResourceManager.GetString("CheatSheetWordBoundary", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches a word boundary position between a word character and non-word character or position (start / end of string). See the word character class (w) for more info..- /// </summary>- internal static string CheatSheetWordBoundaryDetails {- get {- return ResourceManager.GetString("CheatSheetWordBoundaryDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Matches any word character (alphanumeric & underscore). Only matches low-ascii characters (no accented or non-roman characters). Equivalent to [A-Za-z0-9_].- /// </summary>- internal static string CheatSheetWordDetails {- get {- return ResourceManager.GetString("CheatSheetWordDetails", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Configuration.- /// </summary>- internal static string Configuration {- get {- return ResourceManager.GetString("Configuration", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Culture Invariant.- /// </summary>- internal static string CultureInvariant {- get {- return ResourceManager.GetString("CultureInvariant", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Specifies that cultural differences in language is ignored..- /// </summary>- internal static string CultureInvariantDescription {- get {- return ResourceManager.GetString("CultureInvariantDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Validate and test regular expressions.- /// </summary>- internal static string Description {- get {- return ResourceManager.GetString("Description", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to ECMA Script.- /// </summary>- internal static string EcmaScript {- get {- return ResourceManager.GetString("EcmaScript", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Enables ECMAScript-compliant behavior for the expression. This value can be used only in conjunction with the Culture Invariant, Ignore Case and Multiline options..- /// </summary>- internal static string EcmaScriptDescription {- get {- return ResourceManager.GetString("EcmaScriptDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Ignore Case.- /// </summary>- internal static string IgnoreCase {- get {- return ResourceManager.GetString("IgnoreCase", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Specifies case-insensitive matching..- /// </summary>- internal static string IgnoreCaseDescription {- get {- return ResourceManager.GetString("IgnoreCaseDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Ignore Whitespace.- /// </summary>- internal static string IgnoreWhitespace {- get {- return ResourceManager.GetString("IgnoreWhitespace", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Eliminates unescaped white space from the pattern and enables comments marked with #. However, this value does not affect or eliminate white space in character classes, numeric quantifiers, or tokens that mark the beginning of individual regular expression language elements..- /// </summary>- internal static string IgnoreWhitespaceDescription {- get {- return ResourceManager.GetString("IgnoreWhitespaceDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Regular Expression Tester.- /// </summary>- internal static string LongDisplayTitle {- get {- return ResourceManager.GetString("LongDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Group.- /// </summary>- internal static string MatchGroupPrefix {- get {- return ResourceManager.GetString("MatchGroupPrefix", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Match information.- /// </summary>- internal static string MatchInformation {- get {- return ResourceManager.GetString("MatchInformation", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Location.- /// </summary>- internal static string MatchLocation {- get {- return ResourceManager.GetString("MatchLocation", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Name.- /// </summary>- internal static string MatchName {- get {- return ResourceManager.GetString("MatchName", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Match.- /// </summary>- internal static string MatchNamePrefix {- get {- return ResourceManager.GetString("MatchNamePrefix", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Value.- /// </summary>- internal static string MatchValue {- get {- return ResourceManager.GetString("MatchValue", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Multiline.- /// </summary>- internal static string Multiline {- get {- return ResourceManager.GetString("Multiline", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Changes the meaning of ^ and $ so they match at the beginning and end, respectively, of any line, and not just the beginning and end of the entire string..- /// </summary>- internal static string MultilineDescription {- get {- return ResourceManager.GetString("MultilineDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Options.- /// </summary>- internal static string Options {- get {- return ResourceManager.GetString("Options", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Regular expression.- /// </summary>- internal static string RegularExpression {- get {- return ResourceManager.GetString("RegularExpression", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Right To Left.- /// </summary>- internal static string RightToLeft {- get {- return ResourceManager.GetString("RightToLeft", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Specifies that the search will be from right to left instead of from left to right..- /// </summary>- internal static string RightToLeftDescription {- get {- return ResourceManager.GetString("RightToLeftDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to regular expression.- /// </summary>- internal static string SearchKeywords {- get {- return ResourceManager.GetString("SearchKeywords", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to RegEx.- /// </summary>- internal static string ShortDisplayTitle {- get {- return ResourceManager.GetString("ShortDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Singleline.- /// </summary>- internal static string Singleline {- get {- return ResourceManager.GetString("Singleline", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Changes the meaning of the dot (.) so it matches every character (instead of every character except \n)..- /// </summary>- internal static string SinglelineDescription {- get {- return ResourceManager.GetString("SinglelineDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Text.- /// </summary>- internal static string Text {- get {- return ResourceManager.GetString("Text", resourceCulture);- }- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Testers/RegExTester/RegExTester.resx b/src/app/dev/DevToys.Tools/Tools/Testers/RegExTester/RegExTester.resxdeleted file mode 100644index 7066b7cf4..000000000--- a/src/app/dev/DevToys.Tools/Tools/Testers/RegExTester/RegExTester.resx+++ /dev/null@@ -1,729 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<root>- <!--- Microsoft ResX Schema-- Version 2.0-- The primary goals of this format is to allow a simple XML format- that is mostly human readable. The generation and parsing of the- various data types are done through the TypeConverter classes- associated with the data types.-- Example:-- ... ado.net/XML headers & schema ...- <resheader name="resmimetype">text/microsoft-resx</resheader>- <resheader name="version">2.0</resheader>- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">- <value>[base64 mime encoded serialized .NET Framework object]</value>- </data>- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>- <comment>This is a comment</comment>- </data>-- There are any number of "resheader" rows that contain simple- name/value pairs.-- Each data row contains a name, and value. The row also contains a- type or mimetype. Type corresponds to a .NET class that support- text/value conversion through the TypeConverter architecture.- Classes that don't support this are serialized and stored with the- mimetype set.-- The mimetype is used for serialized objects, and tells the- ResXResourceReader how to depersist the object. This is currently not- extensible. For a given mimetype the value must be set accordingly:-- Note - application/x-microsoft.net.object.binary.base64 is the format- that the ResXResourceWriter will generate, however the reader can- read any of the formats listed below.-- mimetype: application/x-microsoft.net.object.binary.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.soap.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.bytearray.base64- value : The object must be serialized into a byte array- : using a System.ComponentModel.TypeConverter- : and then encoded with base64 encoding.- -->- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />- <xsd:element name="root" msdata:IsDataSet="true">- <xsd:complexType>- <xsd:choice maxOccurs="unbounded">- <xsd:element name="metadata">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" />- </xsd:sequence>- <xsd:attribute name="name" use="required" type="xsd:string" />- <xsd:attribute name="type" type="xsd:string" />- <xsd:attribute name="mimetype" type="xsd:string" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="assembly">- <xsd:complexType>- <xsd:attribute name="alias" type="xsd:string" />- <xsd:attribute name="name" type="xsd:string" />- </xsd:complexType>- </xsd:element>- <xsd:element name="data">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="resheader">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" />- </xsd:complexType>- </xsd:element>- </xsd:choice>- </xsd:complexType>- </xsd:element>- </xsd:schema>- <resheader name="resmimetype">- <value>text/microsoft-resx</value>- </resheader>- <resheader name="version">- <value>2.0</value>- </resheader>- <resheader name="reader">- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <resheader name="writer">- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <data name="AccessibleName" xml:space="preserve">- <value>Regular Expression Tester tool</value>- </data>- <data name="AllMatches" xml:space="preserve">- <value>All matches</value>- </data>- <data name="AllMatchesDescription" xml:space="preserve">- <value>Find all the matches in the text or stop after the first match.</value>- </data>- <data name="CheatSheetAlternation" xml:space="preserve">- <value>Alternation</value>- </data>- <data name="CheatSheetAlternationDetails" xml:space="preserve">- <value>Acts like a boolean OR. Matches the expression before or after the |.-It can operate within a group, or on a whole expression. The patterns will be tested in order.</value>- </data>- <data name="CheatSheetAnyCharacter" xml:space="preserve">- <value>Any character except newline</value>- </data>- <data name="CheatSheetAnyCharacterDetails" xml:space="preserve">- <value>Matches any character other than newline. Equivalent to [^\n\r].</value>- </data>- <data name="CheatSheetAtomicGroup" xml:space="preserve">- <value>Atomic group</value>- </data>- <data name="CheatSheetAtomicGroupDetails" xml:space="preserve">- <value>Non-capturing group that discards backtracking positions once matched.-For example, /(?>ab|a)b/ will match abb but not ab because once the ab option has matched, the atomic group prevents backtracking to retry with the a option.</value>- </data>- <data name="CheatSheetBeginning" xml:space="preserve">- <value>Beginning</value>- </data>- <data name="CheatSheetBeginningDetails" xml:space="preserve">- <value>Matches the beginning of the string, or the beginning of a line if the multiline flag (m) is enabled. This matches a position, not a character.</value>- </data>- <data name="CheatSheetBeginningOfString" xml:space="preserve">- <value>Beginning of string</value>- </data>- <data name="CheatSheetBeginningOfStringDetails" xml:space="preserve">- <value>Matches the beginning of the string. Unlike ^, this is unaffected by the multiline flag (m). This matches a position, not a character.</value>- </data>- <data name="CheatSheetBell" xml:space="preserve">- <value>Bell</value>- </data>- <data name="CheatSheetBellDetails" xml:space="preserve">- <value>Matches a BELL character (char code 7).</value>- </data>- <data name="CheatSheetBranchResetGroup" xml:space="preserve">- <value>Branch reset group</value>- </data>- <data name="CheatSheetBranchResetGroupDetails" xml:space="preserve">- <value>Define alternative groups that share the same group numbers.-For example, in (?|(a)|(b)) both groups (a and b) would be counted as group #1.</value>- </data>- <data name="CheatSheetCaptureGroup" xml:space="preserve">- <value>Capture group</value>- </data>- <data name="CheatSheetCaptureGroupDetails" xml:space="preserve">- <value>Inserts the results of the specified capture group. For example, $3 would insert the third capture group.-There are multiple syntaxes for this feature:--$1 \1 \{1}</value>- </data>- <data name="CheatSheetCapturingGroup" xml:space="preserve">- <value>Capturing group</value>- </data>- <data name="CheatSheetCapturingGroupDetails" xml:space="preserve">- <value>Groups multiple tokens together and creates a capture group for extracting a substring or using a backreference.</value>- </data>- <data name="CheatSheetCarriageReturn" xml:space="preserve">- <value>Carriage return</value>- </data>- <data name="CheatSheetCarriageReturnDetails" xml:space="preserve">- <value>Matches a CARRIAGE RETURN character (char code 13).</value>- </data>- <data name="CheatSheetCategoryAnchors" xml:space="preserve">- <value>Anchors</value>- </data>- <data name="CheatSheetCategoryCharacterClasses" xml:space="preserve">- <value>Character classes</value>- </data>- <data name="CheatSheetCategoryEscapedCharacters" xml:space="preserve">- <value>Escaped characters</value>- </data>- <data name="CheatSheetCategoryGroupsReferences" xml:space="preserve">- <value>Groups and References</value>- </data>- <data name="CheatSheetCategoryLookaround" xml:space="preserve">- <value>Lookaround</value>- </data>- <data name="CheatSheetCategoryQuantifiersAlternation" xml:space="preserve">- <value>Quantifiers and Alternation</value>- </data>- <data name="CheatSheetCategorySpecial" xml:space="preserve">- <value>Special</value>- </data>- <data name="CheatSheetCategorySubstitution" xml:space="preserve">- <value>Substitution</value>- </data>- <data name="CheatSheetCharacterRange" xml:space="preserve">- <value>Character range</value>- </data>- <data name="CheatSheetCharacterRangeDetails" xml:space="preserve">- <value>Matches a character having a character code between the two specified characters inclusive.</value>- </data>- <data name="CheatSheetCharacterSet" xml:space="preserve">- <value>A single character of A, b or c</value>- </data>- <data name="CheatSheetCharacterSetDetails" xml:space="preserve">- <value>Matches either an A, b or c character</value>- </data>- <data name="CheatSheetComment" xml:space="preserve">- <value>Comment</value>- </data>- <data name="CheatSheetCommentDetails" xml:space="preserve">- <value>Allows you to insert a comment into your expression that is ignored when finding a match.</value>- </data>- <data name="CheatSheetConditional" xml:space="preserve">- <value>Conditional</value>- </data>- <data name="CheatSheetConditionalDetails" xml:space="preserve">- <value>Conditionally matches one of two options based on whether a lookaround is matched.-For example, /(?(?=a)ab|..)/ will match ab and zx but not ax, because if the first character matches the condition a then it evaluates the pattern ab.--Any lookaround can be used as the condition. A lookahead will start the subsequent match at the start of the condition, a lookbehind will start it after.</value>- </data>- <data name="CheatSheetControlCharacterEscape" xml:space="preserve">- <value>Control character escape</value>- </data>- <data name="CheatSheetControlCharacterEscapeDetails" xml:space="preserve">- <value>Escaped control character in the form \cZ. This can range from \cA (SOH, char code 1) to \cZ (SUB, char code 26).</value>- </data>- <data name="CheatSheetDefine" xml:space="preserve">- <value>Define</value>- </data>- <data name="CheatSheetDefineDetails" xml:space="preserve">- <value>Used to define named groups for use as subroutines without including them in the match.-For example, /A(?(DEFINE)(?'foo'Z))B\g'foo'/ will match ABZ, because the define group is ignored in the match except to define the foo subroutine that is referenced later with \g'foo'.</value>- </data>- <data name="CheatSheetDescription" xml:space="preserve">- <value>Description</value>- </data>- <data name="CheatSheetDigit" xml:space="preserve">- <value>Digit</value>- </data>- <data name="CheatSheetDigitDetails" xml:space="preserve">- <value>Matches any digit character (0-9). Equivalent to [0-9].</value>- </data>- <data name="CheatSheetEnd" xml:space="preserve">- <value>End</value>- </data>- <data name="CheatSheetEndDetails" xml:space="preserve">- <value>Matches the end of the string, or the end of a line if the multiline flag (m) is enabled. This matches a position, not a character.</value>- </data>- <data name="CheatSheetEndOfString" xml:space="preserve">- <value>End of string</value>- </data>- <data name="CheatSheetEndOfStringDetails" xml:space="preserve">- <value>Matches the end of the string. Unlike $, this is unaffected by the multiline flag (m). This matches a position, not a character.</value>- </data>- <data name="CheatSheetEsc" xml:space="preserve">- <value>Esc</value>- </data>- <data name="CheatSheetEscapedCharacters" xml:space="preserve">- <value>Escaped characters</value>- </data>- <data name="CheatSheetEscapedCharactersDetails" xml:space="preserve">- <value>For convenience, these escaped characters are supported in the Replace string in RegExr: \n, \r, \t, \\, and unicode escapes \uFFFF. This may vary in your deploy environment.</value>- </data>- <data name="CheatSheetEscapeSequence" xml:space="preserve">- <value>Escape sequence</value>- </data>- <data name="CheatSheetEscapeSequenceDetails" xml:space="preserve">- <value>All characters between the \Q and the \E are interpreted as a literal string. If \E is omitted, it continues to the end of the expression. For example, the expression /\Q(?.)\E/ will match the string (?.).</value>- </data>- <data name="CheatSheetEscDetails" xml:space="preserve">- <value>Matches a ESC character (char code 27).</value>- </data>- <data name="CheatSheetFormFeed" xml:space="preserve">- <value>Form feed</value>- </data>- <data name="CheatSheetFormFeedDetails" xml:space="preserve">- <value>Matches a FORM FEED character (char code 12).</value>- </data>- <data name="CheatSheetGroupConditional" xml:space="preserve">- <value>Group conditional</value>- </data>- <data name="CheatSheetGroupConditionalDetails" xml:space="preserve">- <value>Conditionally matches one of two options based on whether group 'undefined' matched.-For example, /(z)?(?(1)a|b)/ will match za because the first capture group matches z successfully, which causes the conditional to match the first option a.--The same pattern will also match b on its own, because group 1 doesn't match, so it instead tries to match the second option b.--You can reference a group by name, number, or relative position (ex. -1).</value>- </data>- <data name="CheatSheetHexadecimalEscape" xml:space="preserve">- <value>Hexadecimal escape</value>- </data>- <data name="CheatSheetHexadecimalEscapeDetails" xml:space="preserve">- <value>Hexadecimal escaped character in the form \xFF.</value>- </data>- <data name="CheatSheetHorizontalWhitespace" xml:space="preserve">- <value>Horizontal whitespace</value>- </data>- <data name="CheatSheetHorizontalWhitespaceDetails" xml:space="preserve">- <value>Matches any horizontal whitespace character (spaces, tabs).</value>- </data>- <data name="CheatSheetKeepOut" xml:space="preserve">- <value>Keep out</value>- </data>- <data name="CheatSheetKeepOutDetails" xml:space="preserve">- <value>Keep text matched so far out of the returned match, essentially discarding the match up to this point.For example /o\Kbar/ will match bar within the string foobar</value>- </data>- <data name="CheatSheetLazy" xml:space="preserve">- <value>Lazy</value>- </data>- <data name="CheatSheetLazyDetails" xml:space="preserve">- <value>Makes the preceding quantifier lazy, causing it to match as few characters as possible. By default, quantifiers are greedy, and will match as many characters as possible.-This behaviour is reversed by the ungreedy (U) flag/modifier.</value>- </data>- <data name="CheatSheetLineBreak" xml:space="preserve">- <value>Line break</value>- </data>- <data name="CheatSheetLineBreakDetails" xml:space="preserve">- <value>Matches any line break character, including the CRLF pair, and CR / LF individually.</value>- </data>- <data name="CheatSheetLineFeed" xml:space="preserve">- <value>Line feed</value>- </data>- <data name="CheatSheetLineFeedDetails" xml:space="preserve">- <value>Matches a LINE FEED character (char code 10).</value>- </data>- <data name="CheatSheetMatch" xml:space="preserve">- <value>Match</value>- </data>- <data name="CheatSheetMatchAny" xml:space="preserve">- <value>Match any</value>- </data>- <data name="CheatSheetMatchAnyDetails" xml:space="preserve">- <value>A character set that can be used to match any character, including line breaks, without the dotall flag (s).</value>- </data>- <data name="CheatSheetMatchDetails" xml:space="preserve">- <value>Inserts the matched text.-There are multiple syntaxes for this feature:--$0 \0 \{0}</value>- </data>- <data name="CheatSheetModeModifier" xml:space="preserve">- <value>Mode modifier</value>- </data>- <data name="CheatSheetModeModifierDetails" xml:space="preserve">- <value>Enables or disables modes for the remainder of the expression.Matching modes generally map to expression flags. For example (?i) would enable case insensitivity for the remainder of the expression.-Multiple modifiers can be specified, and any modifiers that follow - are disabled. For example (?im-s) would enable case insensitivity & multiline modes, and disable dotall.--Supported modifiers are: i - case insensitive, s - dotall, m - multiline, x - free spacing, J - allow duplicate names, U - ungreedy.</value>- </data>- <data name="CheatSheetNamedCapturingGroup" xml:space="preserve">- <value>Named capturing group</value>- </data>- <data name="CheatSheetNamedCapturingGroupDetails" xml:space="preserve">- <value>Creates a capturing group that can be referenced via the specified name.-There are multiple syntaxes for this feature:--(?'name'ABC) (?P<name>ABC) (?<name>ABC)</value>- </data>- <data name="CheatSheetNamedReference" xml:space="preserve">- <value>Named reference</value>- </data>- <data name="CheatSheetNamedReferenceDetails" xml:space="preserve">- <value>Matches the results of a named capture group.-There are multiple syntaxes for this feature:--\k'name' \k<name> \k{name} \g{name} (?P=name)</value>- </data>- <data name="CheatSheetNamedSubroutine" xml:space="preserve">- <value>Named subroutine</value>- </data>- <data name="CheatSheetNamedSubroutineDetails" xml:space="preserve">- <value>Matches the expression in a capture group. Compare this to a reference, that matches the result.-There are multiple syntaxes for this feature: \g<name> \g'name' (?&name) (?P>name).</value>- </data>- <data name="CheatSheetNegatedCharacterSet" xml:space="preserve">- <value>A character except A, b or c</value>- </data>- <data name="CheatSheetNegatedCharacterSetDetails" xml:space="preserve">- <value>Match any character that is not A, b or c.</value>- </data>- <data name="CheatSheetNegativeLookahead" xml:space="preserve">- <value>Negative lookahead</value>- </data>- <data name="CheatSheetNegativeLookaheadDetails" xml:space="preserve">- <value>Specifies a group that can not match after the main expression (if it matches, the result is discarded).</value>- </data>- <data name="CheatSheetNegativeLookbehind" xml:space="preserve">- <value>Negative lookbehind</value>- </data>- <data name="CheatSheetNegativeLookbehindDetails" xml:space="preserve">- <value>Specifies a group that can not match before the main expression (if it matches, the result is discarded).</value>- </data>- <data name="CheatSheetNonCapturingGroup" xml:space="preserve">- <value>Non-capturing group</value>- </data>- <data name="CheatSheetNonCapturingGroupDetails" xml:space="preserve">- <value>Groups multiple tokens together without creating a capture group.</value>- </data>- <data name="CheatSheetNotDigit" xml:space="preserve">- <value>Not digit</value>- </data>- <data name="CheatSheetNotDigitDetails" xml:space="preserve">- <value>Matches any character that is not a digit character (0-9). Equivalent to [^0-9].</value>- </data>- <data name="CheatSheetNotHorizontalWhitespace" xml:space="preserve">- <value>Not horizontal whitespace</value>- </data>- <data name="CheatSheetNotHorizontalWhitespaceDetails" xml:space="preserve">- <value>Matches any character that is not a horizontal whitespace character (spaces, tabs).</value>- </data>- <data name="CheatSheetNotLineBreak" xml:space="preserve">- <value>Not line break</value>- </data>- <data name="CheatSheetNotLineBreakDetails" xml:space="preserve">- <value>Matches any character that is not a line break. Similar to dot (.) but is unaffected by the dotall flag (s).</value>- </data>- <data name="CheatSheetNotUnicodeCategory" xml:space="preserve">- <value>Not unicode category</value>- </data>- <data name="CheatSheetNotUnicodeCategoryDetails" xml:space="preserve">- <value>Matches any character that is not in the specified unicode category.</value>- </data>- <data name="CheatSheetNotUnicodeScript" xml:space="preserve">- <value>Not unicode script</value>- </data>- <data name="CheatSheetNotUnicodeScriptDetails" xml:space="preserve">- <value>Matches any character that is not in the specified unicode script.</value>- </data>- <data name="CheatSheetNotVerticalWhitespace" xml:space="preserve">- <value>Not vertical whitespace</value>- </data>- <data name="CheatSheetNotVerticalWhitespaceDetails" xml:space="preserve">- <value>Matches any character that is not a vertical whitespace character (line breaks).</value>- </data>- <data name="CheatSheetNotWhitespace" xml:space="preserve">- <value>Not whitespace</value>- </data>- <data name="CheatSheetNotWhitespaceDetails" xml:space="preserve">- <value>Matches any character that is not a whitespace character (spaces, tabs, line breaks).</value>- </data>- <data name="CheatSheetNotWord" xml:space="preserve">- <value>Not word</value>- </data>- <data name="CheatSheetNotWordBoundary" xml:space="preserve">- <value>Not word boundary</value>- </data>- <data name="CheatSheetNotWordBoundaryDetails" xml:space="preserve">- <value>Matches any position that is not a word boundary. This matches a position, not a character.</value>- </data>- <data name="CheatSheetNotWordDetails" xml:space="preserve">- <value>Matches any character that is not a word character (alphanumeric & underscore). Equivalent to [^A-Za-z0-9_]</value>- </data>- <data name="CheatSheetNull" xml:space="preserve">- <value>Null</value>- </data>- <data name="CheatSheetNullDetails" xml:space="preserve">- <value>Matches a NULL character (char code 0).</value>- </data>- <data name="CheatSheetNumericReference" xml:space="preserve">- <value>Numeric reference</value>- </data>- <data name="CheatSheetNumericReferenceDetails" xml:space="preserve">- <value>Matches the results of a capture group. For example \1 matches the results of the first capture group & \3 matches the third.-There are multiple syntaxes for this feature: \1 \g1 \g{1}.--The latter syntaxes support relative values preceded by + or -. For example \g-1 would match the group preceding the reference.</value>- </data>- <data name="CheatSheetNumericSubroutine" xml:space="preserve">- <value>Numeric subroutine</value>- </data>- <data name="CheatSheetNumericSubroutineDetails" xml:space="preserve">- <value>Matches the expression in a capture group. Compare this to a reference, that matches the result. For example /(a|b)\g'1'/ can match ab, because the expression a|b is evaluated again.-There are multiple syntaxes for this feature: \g<1> \g'1' (?1).--Relative values preceded by + or - are also supported. For example \g<-1> would match the group preceding the reference.</value>- </data>- <data name="CheatSheetOctalEscape" xml:space="preserve">- <value>Octal escape</value>- </data>- <data name="CheatSheetOctalEscapeDetails" xml:space="preserve">- <value>Octal escaped character in the form \000. Value must be less than 255 (\377).-The syntax \o{FFF} is also supported.</value>- </data>- <data name="CheatSheetOptional" xml:space="preserve">- <value>Optional</value>- </data>- <data name="CheatSheetOptionalDetails" xml:space="preserve">- <value>Matches 0 or 1 of the preceding token, effectively making it optional.</value>- </data>- <data name="CheatSheetPlus" xml:space="preserve">- <value>Plus</value>- </data>- <data name="CheatSheetPlusDetails" xml:space="preserve">- <value>Matches 1 or more of the preceding token.</value>- </data>- <data name="CheatSheetPositiveLookahead" xml:space="preserve">- <value>Positive lookahead</value>- </data>- <data name="CheatSheetPositiveLookaheadDetails" xml:space="preserve">- <value>Matches a group after the main expression without including it in the result.</value>- </data>- <data name="CheatSheetPositiveLookbehind" xml:space="preserve">- <value>Positive lookbehind</value>- </data>- <data name="CheatSheetPositiveLookbehindDetails" xml:space="preserve">- <value>Matches a group before the main expression without including it in the result.</value>- </data>- <data name="CheatSheetPossessive" xml:space="preserve">- <value>Possessive</value>- </data>- <data name="CheatSheetPossessiveDetails" xml:space="preserve">- <value>Makes the preceding quantifier possessive. It will match as many characters as possible, and will not release them to match subsequent tokens.-For example /.*a/ would match aaa, but /.*+a/ would not, because the repeating dot would match and not release the last character to match a.</value>- </data>- <data name="CheatSheetPreviousMatchEnd" xml:space="preserve">- <value>Previous match end</value>- </data>- <data name="CheatSheetPreviousMatchEndDetails" xml:space="preserve">- <value>Matches the end position of the previous match. This matches a position, not a character.</value>- </data>- <data name="CheatSheetQuantifier" xml:space="preserve">- <value>Quantifier</value>- </data>- <data name="CheatSheetQuantifierDetails" xml:space="preserve">- <value>Matches the specified quantity of the previous token. {1,3} will match 1 to 3. {3} will match exactly 3. {3,} will match 3 or more.</value>- </data>- <data name="CheatSheetRecursion" xml:space="preserve">- <value>Recursion</value>- </data>- <data name="CheatSheetRecursionDetails" xml:space="preserve">- <value>Attempts to match the full expression again at the current position.-For example, /a(?R)?b/ will match any number of a followed by the same number of z: the full text of az or aaaazzzz, but not azzz.--There are multiple syntaxes for this feature:--(?R) (?0) \g<0> \g'0'</value>- </data>- <data name="CheatSheetReservedCharacters" xml:space="preserve">- <value>Reserved characters</value>- </data>- <data name="CheatSheetReservedCharactersDetails" xml:space="preserve">- <value>The following character have special meaning, and should be preceded by a \ (backslash) to represent a literal character:-+*?^$\.[]{}()|/--Within a character set, only \, -, and ] need to be escaped.</value>- </data>- <data name="CheatSheetStar" xml:space="preserve">- <value>Star</value>- </data>- <data name="CheatSheetStarDetails" xml:space="preserve">- <value>Matches 0 or more of the preceding token.</value>- </data>- <data name="CheatSheetStrictEndOfString" xml:space="preserve">- <value>Strict end of string</value>- </data>- <data name="CheatSheetStrictEndOfStringDetails" xml:space="preserve">- <value>Matches the end of the string. Unlike $ or \Z, it does not allow for a trailing newline. This is unaffected by the multiline flag (m). This matches a position, not a character.</value>- </data>- <data name="CheatSheetSyntax" xml:space="preserve">- <value>Syntax</value>- </data>- <data name="CheatSheetTab" xml:space="preserve">- <value>Tab</value>- </data>- <data name="CheatSheetTabDetails" xml:space="preserve">- <value>Matches a TAB character (char code 9).</value>- </data>- <data name="CheatSheetTitle" xml:space="preserve">- <value>Cheat sheet</value>- </data>- <data name="CheatSheetUnicodeCategory" xml:space="preserve">- <value>Unicode category</value>- </data>- <data name="CheatSheetUnicodeCategoryDetails" xml:space="preserve">- <value>Matches a character in the specified unicode category. For example, \p{Ll} will match any lowercase letter.</value>- </data>- <data name="CheatSheetUnicodeEscape" xml:space="preserve">- <value>Unicode escape</value>- </data>- <data name="CheatSheetUnicodeEscapeDetails" xml:space="preserve">- <value>Unicode escaped character in the form \x{FF}.</value>- </data>- <data name="CheatSheetUnicodeGrapheme" xml:space="preserve">- <value>Unicode grapheme</value>- </data>- <data name="CheatSheetUnicodeGraphemeDetails" xml:space="preserve">- <value>Matches any single unicode grapheme (ie. character). This includes line breaks (regardless of the dotall mode) and graphemes encoded as multiple code points.</value>- </data>- <data name="CheatSheetUnicodeScript" xml:space="preserve">- <value>Unicode script</value>- </data>- <data name="CheatSheetUnicodeScriptDetails" xml:space="preserve">- <value>Matches any character in the specified unicode script. For example, \p{Arabic} will match characters in the Arabic script.</value>- </data>- <data name="CheatSheetVerticalWhitespace" xml:space="preserve">- <value>Vertical whitespace</value>- </data>- <data name="CheatSheetVerticalWhitespaceDetails" xml:space="preserve">- <value>Matches any vertical whitespace character (line breaks).</value>- </data>- <data name="CheatSheetWhitespace" xml:space="preserve">- <value>Whitespace</value>- </data>- <data name="CheatSheetWhitespaceDetails" xml:space="preserve">- <value>Matches any whitespace character (spaces, tabs, line breaks).</value>- </data>- <data name="CheatSheetWord" xml:space="preserve">- <value>Word</value>- </data>- <data name="CheatSheetWordBoundary" xml:space="preserve">- <value>Word boundary</value>- </data>- <data name="CheatSheetWordBoundaryDetails" xml:space="preserve">- <value>Matches a word boundary position between a word character and non-word character or position (start / end of string). See the word character class (w) for more info.</value>- </data>- <data name="CheatSheetWordDetails" xml:space="preserve">- <value>Matches any word character (alphanumeric & underscore). Only matches low-ascii characters (no accented or non-roman characters). Equivalent to [A-Za-z0-9_]</value>- </data>- <data name="Configuration" xml:space="preserve">- <value>Configuration</value>- </data>- <data name="CultureInvariant" xml:space="preserve">- <value>Culture Invariant</value>- </data>- <data name="CultureInvariantDescription" xml:space="preserve">- <value>Specifies that cultural differences in language is ignored.</value>- </data>- <data name="Description" xml:space="preserve">- <value>Validate and test regular expressions</value>- </data>- <data name="EcmaScript" xml:space="preserve">- <value>ECMA Script</value>- </data>- <data name="EcmaScriptDescription" xml:space="preserve">- <value>Enables ECMAScript-compliant behavior for the expression. This value can be used only in conjunction with the Culture Invariant, Ignore Case and Multiline options.</value>- </data>- <data name="IgnoreCase" xml:space="preserve">- <value>Ignore Case</value>- </data>- <data name="IgnoreCaseDescription" xml:space="preserve">- <value>Specifies case-insensitive matching.</value>- </data>- <data name="IgnoreWhitespace" xml:space="preserve">- <value>Ignore Whitespace</value>- </data>- <data name="IgnoreWhitespaceDescription" xml:space="preserve">- <value>Eliminates unescaped white space from the pattern and enables comments marked with #. However, this value does not affect or eliminate white space in character classes, numeric quantifiers, or tokens that mark the beginning of individual regular expression language elements.</value>- </data>- <data name="LongDisplayTitle" xml:space="preserve">- <value>Regular Expression Tester</value>- </data>- <data name="MatchGroupPrefix" xml:space="preserve">- <value>Group</value>- </data>- <data name="MatchInformation" xml:space="preserve">- <value>Match information</value>- </data>- <data name="MatchLocation" xml:space="preserve">- <value>Location</value>- </data>- <data name="MatchName" xml:space="preserve">- <value>Name</value>- </data>- <data name="MatchNamePrefix" xml:space="preserve">- <value>Match</value>- </data>- <data name="MatchValue" xml:space="preserve">- <value>Value</value>- </data>- <data name="Multiline" xml:space="preserve">- <value>Multiline</value>- </data>- <data name="MultilineDescription" xml:space="preserve">- <value>Changes the meaning of ^ and $ so they match at the beginning and end, respectively, of any line, and not just the beginning and end of the entire string.</value>- </data>- <data name="Options" xml:space="preserve">- <value>Options</value>- </data>- <data name="RegularExpression" xml:space="preserve">- <value>Regular expression</value>- </data>- <data name="RightToLeft" xml:space="preserve">- <value>Right To Left</value>- </data>- <data name="RightToLeftDescription" xml:space="preserve">- <value>Specifies that the search will be from right to left instead of from left to right.</value>- </data>- <data name="SearchKeywords" xml:space="preserve">- <value>regular expression</value>- </data>- <data name="ShortDisplayTitle" xml:space="preserve">- <value>RegEx</value>- </data>- <data name="Singleline" xml:space="preserve">- <value>Singleline</value>- </data>- <data name="SinglelineDescription" xml:space="preserve">- <value>Changes the meaning of the dot (.) so it matches every character (instead of every character except \n).</value>- </data>- <data name="Text" xml:space="preserve">- <value>Text</value>- </data>-</root>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/Testers/RegExTester/RegExTesterGuiTool.cs b/src/app/dev/DevToys.Tools/Tools/Testers/RegExTester/RegExTesterGuiTool.csdeleted file mode 100644index 96dd0d4f8..000000000--- a/src/app/dev/DevToys.Tools/Tools/Testers/RegExTester/RegExTesterGuiTool.cs+++ /dev/null@@ -1,617 +0,0 @@-using System.Text.RegularExpressions;-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.Tools.Testers.RegExTester;--[Export(typeof(IGuiTool))]-[Name("RegExTester")]-[ToolDisplayInformation(- IconFontName = "DevToys-Tools-Icons",- IconGlyph = '\u0113',- GroupName = PredefinedCommonToolGroupNames.Testers,- ResourceManagerAssemblyIdentifier = nameof(DevToysToolsResourceManagerAssemblyIdentifier),- ResourceManagerBaseName = "DevToys.Tools.Tools.Testers.RegExTester.RegExTester",- ShortDisplayTitleResourceName = nameof(RegExTester.ShortDisplayTitle),- LongDisplayTitleResourceName = nameof(RegExTester.LongDisplayTitle),- DescriptionResourceName = nameof(RegExTester.Description),- AccessibleNameResourceName = nameof(RegExTester.AccessibleName),- SearchKeywordsResourceName = nameof(RegExTester.SearchKeywords))]-[NoCompactOverlaySupport] // UI is too crowded for it. TODO: Consider adding an event to IThemeListener to notify when entering Picture-in-Picture mode and update the UI accordingly.-[AcceptedDataTypeName(PredefinedCommonDataTypeNames.Text)]-internal sealed class RegExTesterGuiTool : IGuiTool, IDisposable-{- private static readonly IUIDataGridRow[] cheatSheetRows- = new[]- {- CreateCheatSheetTitleRow(RegExTester.CheatSheetCategoryCharacterClasses),- CreateCheatSheetRow(@".", RegExTester.CheatSheetAnyCharacter, RegExTester.CheatSheetAnyCharacterDetails),- CreateCheatSheetRow(@"[Abc]", RegExTester.CheatSheetCharacterSet, RegExTester.CheatSheetCharacterSetDetails),- CreateCheatSheetRow(@"[^Abc]", RegExTester.CheatSheetNegatedCharacterSet, RegExTester.CheatSheetNegatedCharacterSetDetails),- CreateCheatSheetRow(@"[A-Z]", RegExTester.CheatSheetCharacterRange, RegExTester.CheatSheetCharacterRangeDetails),- CreateCheatSheetRow(@"[\s\S]", RegExTester.CheatSheetMatchAny, RegExTester.CheatSheetMatchAnyDetails),- CreateCheatSheetRow(@"\X", RegExTester.CheatSheetUnicodeGrapheme, RegExTester.CheatSheetUnicodeGraphemeDetails),- CreateCheatSheetRow(@"\w", RegExTester.CheatSheetWord, RegExTester.CheatSheetWordDetails),- CreateCheatSheetRow(@"\W", RegExTester.CheatSheetNotWord, RegExTester.CheatSheetNotWordDetails),- CreateCheatSheetRow(@"\d", RegExTester.CheatSheetDigit, RegExTester.CheatSheetDigitDetails),- CreateCheatSheetRow(@"\D", RegExTester.CheatSheetNotDigit, RegExTester.CheatSheetNotDigitDetails),- CreateCheatSheetRow(@"\s", RegExTester.CheatSheetWhitespace, RegExTester.CheatSheetWhitespaceDetails),- CreateCheatSheetRow(@"\S", RegExTester.CheatSheetNotWhitespace, RegExTester.CheatSheetNotWhitespaceDetails),- CreateCheatSheetRow(@"\h", RegExTester.CheatSheetHorizontalWhitespace, RegExTester.CheatSheetHorizontalWhitespaceDetails),- CreateCheatSheetRow(@"\H", RegExTester.CheatSheetNotHorizontalWhitespace, RegExTester.CheatSheetNotHorizontalWhitespaceDetails),- CreateCheatSheetRow(@"\V", RegExTester.CheatSheetVerticalWhitespace, RegExTester.CheatSheetVerticalWhitespaceDetails),- CreateCheatSheetRow(@"\V", RegExTester.CheatSheetNotVerticalWhitespace, RegExTester.CheatSheetNotVerticalWhitespaceDetails),- CreateCheatSheetRow(@"\R", RegExTester.CheatSheetLineBreak, RegExTester.CheatSheetLineBreakDetails),- CreateCheatSheetRow(@"\N", RegExTester.CheatSheetNotLineBreak, RegExTester.CheatSheetNotLineBreakDetails),- CreateCheatSheetRow(@"\p{L}", RegExTester.CheatSheetUnicodeCategory, RegExTester.CheatSheetUnicodeCategoryDetails),- CreateCheatSheetRow(@"\P{L}", RegExTester.CheatSheetNotUnicodeCategory, RegExTester.CheatSheetNotUnicodeCategoryDetails),- CreateCheatSheetRow(@"\p{Han}", RegExTester.CheatSheetUnicodeScript, RegExTester.CheatSheetUnicodeScriptDetails),- CreateCheatSheetRow(@"\P{Han}", RegExTester.CheatSheetNotUnicodeScript, RegExTester.CheatSheetNotUnicodeScriptDetails),-- CreateCheatSheetTitleRow(RegExTester.CheatSheetCategoryAnchors),- CreateCheatSheetRow(@"\A", RegExTester.CheatSheetBeginningOfString, RegExTester.CheatSheetBeginningOfStringDetails),- CreateCheatSheetRow(@"\Z", RegExTester.CheatSheetEndOfString, RegExTester.CheatSheetEndOfStringDetails),- CreateCheatSheetRow(@"\z", RegExTester.CheatSheetStrictEndOfString, RegExTester.CheatSheetStrictEndOfStringDetails),- CreateCheatSheetRow(@"^", RegExTester.CheatSheetBeginning, RegExTester.CheatSheetBeginningDetails),- CreateCheatSheetRow(@"$", RegExTester.CheatSheetEnd, RegExTester.CheatSheetEndDetails),- CreateCheatSheetRow(@"\b", RegExTester.CheatSheetWordBoundary, RegExTester.CheatSheetWordBoundaryDetails),- CreateCheatSheetRow(@"\B", RegExTester.CheatSheetNotWordBoundary, RegExTester.CheatSheetNotWordBoundaryDetails),- CreateCheatSheetRow(@"\G", RegExTester.CheatSheetPreviousMatchEnd, RegExTester.CheatSheetPreviousMatchEndDetails),-- CreateCheatSheetTitleRow(RegExTester.CheatSheetCategoryEscapedCharacters),- CreateCheatSheetRow(@"\+", RegExTester.CheatSheetReservedCharacters, RegExTester.CheatSheetReservedCharactersDetails),- CreateCheatSheetRow(@"\000", RegExTester.CheatSheetOctalEscape, RegExTester.CheatSheetOctalEscapeDetails),- CreateCheatSheetRow(@"\xFF", RegExTester.CheatSheetHexadecimalEscape, RegExTester.CheatSheetHexadecimalEscapeDetails),- CreateCheatSheetRow(@"\x{FF}", RegExTester.CheatSheetUnicodeEscape, RegExTester.CheatSheetUnicodeEscapeDetails),- CreateCheatSheetRow(@"\cI", RegExTester.CheatSheetControlCharacterEscape, RegExTester.CheatSheetControlCharacterEscapeDetails),- CreateCheatSheetRow(@"\Q...\E", RegExTester.CheatSheetEscapeSequence, RegExTester.CheatSheetEscapeSequenceDetails),- CreateCheatSheetRow(@"\t", RegExTester.CheatSheetTab, RegExTester.CheatSheetTabDetails),- CreateCheatSheetRow(@"\n", RegExTester.CheatSheetLineFeed, RegExTester.CheatSheetLineFeedDetails),- CreateCheatSheetRow(@"\f", RegExTester.CheatSheetFormFeed, RegExTester.CheatSheetFormFeedDetails),- CreateCheatSheetRow(@"\r", RegExTester.CheatSheetCarriageReturn, RegExTester.CheatSheetCarriageReturnDetails),- CreateCheatSheetRow(@"\0", RegExTester.CheatSheetNull, RegExTester.CheatSheetNullDetails),- CreateCheatSheetRow(@"\a", RegExTester.CheatSheetBell, RegExTester.CheatSheetBellDetails),- CreateCheatSheetRow(@"\e", RegExTester.CheatSheetEsc, RegExTester.CheatSheetEscDetails),-- CreateCheatSheetTitleRow(RegExTester.CheatSheetCategoryGroupsReferences),- CreateCheatSheetRow(@"(ABC)", RegExTester.CheatSheetCapturingGroup, RegExTester.CheatSheetCapturingGroupDetails),- CreateCheatSheetRow(@"(?<name>ABC)", RegExTester.CheatSheetNamedCapturingGroup, RegExTester.CheatSheetNamedCapturingGroupDetails),- CreateCheatSheetRow(@"\k'name'", RegExTester.CheatSheetNamedReference, RegExTester.CheatSheetNamedReferenceDetails),- CreateCheatSheetRow(@"\1", RegExTester.CheatSheetNumericReference, RegExTester.CheatSheetNumericReferenceDetails),- CreateCheatSheetRow(@"(?|(a)|(b))", RegExTester.CheatSheetBranchResetGroup, RegExTester.CheatSheetBranchResetGroupDetails),- CreateCheatSheetRow(@"(?:ABC)", RegExTester.CheatSheetNonCapturingGroup, RegExTester.CheatSheetNonCapturingGroupDetails),- CreateCheatSheetRow(@"(?>ABC)", RegExTester.CheatSheetAtomicGroup, RegExTester.CheatSheetAtomicGroupDetails),- CreateCheatSheetRow(@"(?(DEFINE)(?'foo'ABC))", RegExTester.CheatSheetDefine, RegExTester.CheatSheetDefineDetails),- CreateCheatSheetRow(@"\g'1'", RegExTester.CheatSheetNumericSubroutine, RegExTester.CheatSheetNumericSubroutineDetails),- CreateCheatSheetRow(@"\g'name'", RegExTester.CheatSheetNamedSubroutine, RegExTester.CheatSheetNamedSubroutineDetails),-- CreateCheatSheetTitleRow(RegExTester.CheatSheetCategoryLookaround),- CreateCheatSheetRow(@"(?=ABC)", RegExTester.CheatSheetPositiveLookahead, RegExTester.CheatSheetPositiveLookaheadDetails),- CreateCheatSheetRow(@"(?!ABC)", RegExTester.CheatSheetNegativeLookahead, RegExTester.CheatSheetNegativeLookaheadDetails),- CreateCheatSheetRow(@"(?<=ABC)", RegExTester.CheatSheetPositiveLookbehind, RegExTester.CheatSheetPositiveLookbehindDetails),- CreateCheatSheetRow(@"(?<!ABC)", RegExTester.CheatSheetNegativeLookbehind, RegExTester.CheatSheetNegativeLookbehindDetails),- CreateCheatSheetRow(@"\K", RegExTester.CheatSheetKeepOut, RegExTester.CheatSheetKeepOutDetails),-- CreateCheatSheetTitleRow(RegExTester.CheatSheetCategoryQuantifiersAlternation),- CreateCheatSheetRow(@"+", RegExTester.CheatSheetPlus, RegExTester.CheatSheetPlusDetails),- CreateCheatSheetRow(@"*", RegExTester.CheatSheetStar, RegExTester.CheatSheetStarDetails),- CreateCheatSheetRow(@"{1,3}", RegExTester.CheatSheetQuantifier, RegExTester.CheatSheetQuantifierDetails),- CreateCheatSheetRow(@"?", RegExTester.CheatSheetOptional, RegExTester.CheatSheetOptionalDetails),- CreateCheatSheetRow(@"?", RegExTester.CheatSheetLazy, RegExTester.CheatSheetLazyDetails),- CreateCheatSheetRow(@"+", RegExTester.CheatSheetPossessive, RegExTester.CheatSheetPossessiveDetails),- CreateCheatSheetRow(@"|", RegExTester.CheatSheetAlternation, RegExTester.CheatSheetAlternationDetails),-- CreateCheatSheetTitleRow(RegExTester.CheatSheetCategorySpecial),- CreateCheatSheetRow(@"(?#foo)", RegExTester.CheatSheetComment, RegExTester.CheatSheetCommentDetails),- CreateCheatSheetRow(@"(?(?=A)B|C)", RegExTester.CheatSheetConditional, RegExTester.CheatSheetConditionalDetails),- CreateCheatSheetRow(@"(?(1)B|C)", RegExTester.CheatSheetGroupConditional, RegExTester.CheatSheetGroupConditionalDetails),- CreateCheatSheetRow(@"(?R)", RegExTester.CheatSheetRecursion, RegExTester.CheatSheetRecursionDetails),- CreateCheatSheetRow(@"(?i)", RegExTester.CheatSheetModeModifier, RegExTester.CheatSheetModeModifierDetails),-- CreateCheatSheetTitleRow(RegExTester.CheatSheetCategorySubstitution),- CreateCheatSheetRow(@"$0", RegExTester.CheatSheetMatch, RegExTester.CheatSheetMatchDetails),- CreateCheatSheetRow(@"$1", RegExTester.CheatSheetCaptureGroup, RegExTester.CheatSheetCaptureGroupDetails),- CreateCheatSheetRow(@"\n", RegExTester.CheatSheetEscapedCharacters, RegExTester.CheatSheetEscapedCharactersDetails)- };-- private static readonly SettingDefinition<bool> allMatches- = new(- name: $"{nameof(RegExTesterGuiTool)}.{nameof(allMatches)}",- defaultValue: true);-- private static readonly SettingDefinition<bool> ecmaScript- = new(- name: $"{nameof(RegExTesterGuiTool)}.{nameof(ecmaScript)}",- defaultValue: false);-- private static readonly SettingDefinition<bool> cultureInvariant- = new(- name: $"{nameof(RegExTesterGuiTool)}.{nameof(cultureInvariant)}",- defaultValue: false);-- private static readonly SettingDefinition<bool> ignoreCase- = new(- name: $"{nameof(RegExTesterGuiTool)}.{nameof(ignoreCase)}",- defaultValue: false);-- private static readonly SettingDefinition<bool> ignoreWhitespace- = new(- name: $"{nameof(RegExTesterGuiTool)}.{nameof(ignoreWhitespace)}",- defaultValue: false);-- private static readonly SettingDefinition<bool> singleline- = new(- name: $"{nameof(RegExTesterGuiTool)}.{nameof(singleline)}",- defaultValue: false);-- private static readonly SettingDefinition<bool> multiline- = new(- name: $"{nameof(RegExTesterGuiTool)}.{nameof(multiline)}",- defaultValue: false);-- private static readonly SettingDefinition<bool> rightToLeft- = new(- name: $"{nameof(RegExTesterGuiTool)}.{nameof(rightToLeft)}",- defaultValue: false);-- private enum GridRows- {- TopAuto,- Stretch,- }-- private enum GridColumns- {- Stretch- }-- private readonly DisposableSemaphore _semaphore = new();- private readonly ILogger _logger;- private readonly ISettingsProvider _settingsProvider;- private readonly IUISetting _ignoreWhitespaceSetting = Setting("regex-tester-ignore-whitespace-setting");- private readonly IUISetting _singlelineSetting = Setting("regex-tester-singleline-setting");- private readonly IUISetting _rightToLeftSetting = Setting("regex-tester-right-to-left-setting");- private readonly IUIDataGrid _matchesDataGrid = DataGrid("regex-tester-match-information-data-grid");- private readonly IUISingleLineTextInput _regexInput = SingleLineTextInput("regex-tester-regular-expression-input");- private readonly IUIMultiLineTextInput _inputText = MultilineTextInput("regex-tester-text-input");-- private CancellationTokenSource? _cancellationTokenSource;-- [ImportingConstructor]- public RegExTesterGuiTool(ISettingsProvider settingsProvider)- {- _logger = this.Log();- _settingsProvider = settingsProvider;-- OnEcmaScriptOptionChangedAsync(_settingsProvider.GetSetting(ecmaScript));- }-- // For unit tests.- internal Task? WorkTask { get; private set; }-- public UIToolView View- => new(- isScrollable: false,- Grid()- .ColumnMediumSpacing()-- .Rows(- (GridRows.TopAuto, Auto),- (GridRows.Stretch, new UIGridLength(1, UIGridUnitType.Fraction)))-- .Columns(- (GridColumns.Stretch, new UIGridLength(1, UIGridUnitType.Fraction)))-- .Cells(- Cell(- GridRows.TopAuto,- GridColumns.Stretch,-- Stack()- .Vertical()-- .WithChildren(- Label()- .Text(RegExTester.Configuration),-- SettingGroup("regex-tester-settings")- .Icon("FluentSystemIcons", '\uF6A9')- .Title(RegExTester.Options)-- .WithSettings(- Setting("regex-tester-all-matches-setting")- .Title(RegExTester.AllMatches)- .Description(RegExTester.AllMatchesDescription)- .Handle(- _settingsProvider,- allMatches,- stateDescriptionWhenOn: RegExTester.AllMatches,- stateDescriptionWhenOff: null,- OnSettingChangedAsync),-- Setting("regex-tester-ecma-script-setting")- .Title(RegExTester.EcmaScript)- .Description(RegExTester.EcmaScriptDescription)- .Handle(- _settingsProvider,- ecmaScript,- stateDescriptionWhenOn: RegExTester.EcmaScript,- stateDescriptionWhenOff: null,- OnEcmaScriptOptionChangedAsync),-- Setting("regex-tester-culture-invariant-setting")- .Title(RegExTester.CultureInvariant)- .Description(RegExTester.CultureInvariantDescription)- .Handle(- _settingsProvider,- cultureInvariant,- stateDescriptionWhenOn: RegExTester.CultureInvariant,- stateDescriptionWhenOff: null,- OnSettingChangedAsync),-- Setting("regex-tester-ignore-case-setting")- .Title(RegExTester.IgnoreCase)- .Description(RegExTester.IgnoreCaseDescription)- .Handle(- _settingsProvider,- ignoreCase,- stateDescriptionWhenOn: RegExTester.IgnoreCase,- stateDescriptionWhenOff: null,- OnSettingChangedAsync),-- _ignoreWhitespaceSetting- .Title(RegExTester.IgnoreWhitespace)- .Description(RegExTester.IgnoreWhitespaceDescription)- .Handle(- _settingsProvider,- ignoreWhitespace,- stateDescriptionWhenOn: RegExTester.IgnoreWhitespace,- stateDescriptionWhenOff: null,- OnSettingChangedAsync),-- _singlelineSetting- .Title(RegExTester.Singleline)- .Description(RegExTester.SinglelineDescription)- .Handle(- _settingsProvider,- singleline,- stateDescriptionWhenOn: RegExTester.Singleline,- stateDescriptionWhenOff: null,- OnSettingChangedAsync),-- Setting("regex-tester-multiline-setting")- .Title(RegExTester.Multiline)- .Description(RegExTester.MultilineDescription)- .Handle(- _settingsProvider,- multiline,- stateDescriptionWhenOn: RegExTester.Multiline,- stateDescriptionWhenOff: null,- OnSettingChangedAsync),-- _rightToLeftSetting- .Title(RegExTester.RightToLeft)- .Description(RegExTester.RightToLeftDescription)- .Handle(- _settingsProvider,- rightToLeft,- stateDescriptionWhenOn: RegExTester.RightToLeft,- stateDescriptionWhenOff: null,- OnSettingChangedAsync)))),-- Cell(- GridRows.Stretch,- GridColumns.Stretch,-- SplitGrid()- .Vertical()- .LeftPaneLength(new UIGridLength(2, UIGridUnitType.Fraction))- .RightPaneLength(new UIGridLength(1, UIGridUnitType.Fraction))-- .WithLeftPaneChild(- Grid()- .ColumnMediumSpacing()-- .Rows(- (GridRows.TopAuto, Auto),- (GridRows.Stretch, new UIGridLength(1, UIGridUnitType.Fraction)))-- .Columns(- (GridColumns.Stretch, new UIGridLength(1, UIGridUnitType.Fraction)))-- .Cells(- Cell(- GridRows.TopAuto,- GridColumns.Stretch,-- _regexInput- .Title(RegExTester.RegularExpression)- .OnTextChanged(OnRegularExpressionChangedAsync)),-- Cell(- GridRows.Stretch,- GridColumns.Stretch,-- _inputText- .Title(RegExTester.Text)- .OnTextChanged(OnTextChangedAsync))))-- .WithRightPaneChild(- SplitGrid()- .Horizontal()-- .WithTopPaneChild(- DataGrid()- .Title(RegExTester.CheatSheetTitle)- .Extendable()- .WithColumns(RegExTester.CheatSheetDescription, RegExTester.CheatSheetSyntax)- .WithRows(cheatSheetRows))-- .WithBottomPaneChild(- _matchesDataGrid- .Title(RegExTester.MatchInformation)- .WithColumns(- RegExTester.MatchName,- RegExTester.MatchLocation,- RegExTester.MatchValue)- .OnRowSelected(OnMatchesDataGridRowSelected))))));-- public void OnDataReceived(string dataTypeName, object? parsedData)- {- if (dataTypeName == PredefinedCommonDataTypeNames.Text && parsedData is string text)- {- _inputText.Text(text); // This will trigger a regex test.- }- }-- public void Dispose()- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _semaphore.Dispose();- }-- private ValueTask OnEcmaScriptOptionChangedAsync(bool value)- {- if (value)- {- _settingsProvider.SetSetting(ignoreWhitespace, false);- _settingsProvider.SetSetting(singleline, false);- _settingsProvider.SetSetting(rightToLeft, false);- _ignoreWhitespaceSetting.Disable();- _singlelineSetting.Disable();- _rightToLeftSetting.Disable();- }- else- {- _ignoreWhitespaceSetting.Enable();- _singlelineSetting.Enable();- _rightToLeftSetting.Enable();- }-- return OnSettingChangedAsync(value);- }-- private void OnMatchesDataGridRowSelected(IUIDataGridRow? selectedRow)- {- if (selectedRow is not null)- {- if (selectedRow.Value is Capture matchOrGroup)- {- _inputText.Select(matchOrGroup.Index, matchOrGroup.Length);- }- }- else- {- _inputText.Select(0, 0);- }- }-- private ValueTask OnSettingChangedAsync(bool _)- {- StartRegExMatch();- return ValueTask.CompletedTask;- }-- private ValueTask OnRegularExpressionChangedAsync(string regularExpression)- {- StartRegExMatch();- return ValueTask.CompletedTask;- }-- private ValueTask OnTextChangedAsync(string regularExpression)- {- StartRegExMatch();- return ValueTask.CompletedTask;- }-- private void StartRegExMatch()- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _cancellationTokenSource = new CancellationTokenSource();-- WorkTask- = RegExMatchAsync(- _regexInput.Text,- _inputText.Text,- _settingsProvider.GetSetting(allMatches),- _settingsProvider.GetSetting(ecmaScript),- _settingsProvider.GetSetting(cultureInvariant),- _settingsProvider.GetSetting(ignoreCase),- _settingsProvider.GetSetting(ignoreWhitespace),- _settingsProvider.GetSetting(singleline),- _settingsProvider.GetSetting(multiline),- _settingsProvider.GetSetting(rightToLeft),- _cancellationTokenSource.Token);- }-- private async Task RegExMatchAsync(- string regex,- string text,- bool allMatches,- bool isEcmaScript,- bool isCultureInvariant,- bool ignoreCase,- bool ignoreWhitespace,- bool singleline,- bool multiline,- bool rightToLeft,- CancellationToken cancellationToken)- {- using (await _semaphore.WaitAsync(cancellationToken))- {- await TaskSchedulerAwaiter.SwitchOffMainThreadAsync(cancellationToken);-- try- {- RegexOptions options- = GetRegexOptions(- isEcmaScript,- isCultureInvariant,- ignoreCase,- ignoreWhitespace,- singleline,- multiline,- rightToLeft);-- var regexObject = new Regex(regex, options);- MatchCollection matches = regexObject.Matches(text);-- int amountOfColorsInUIHighlightedTextSpanColor = Enum.GetNames(typeof(UIHighlightedTextSpanColor)).Length;-- var highlightedSpans = new List<UIHighlightedTextSpan>();- var gridRows = new List<IUIDataGridRow>();-- for (int i = 0; i < matches.Count; i++)- {- Match match = matches[i];- if (match.Length > 0)- {- highlightedSpans.Add(- new UIHighlightedTextSpan(- match.Index,- match.Length,- UIHighlightedTextSpanColor.Blue));-- gridRows.Add(- Row(- match,- Cell($"{RegExTester.MatchNamePrefix} {i + 1}\t"),- Cell(Label().Style(UILabelStyle.Caption).NeverWrap().Text($"{match.Index}-{match.Index + match.Length}")),- Cell(match.Value)));-- // Start from 1 to skip the first group which is the entire match- for (int j = 1; j < match.Groups.Count; j++)- {- Group group = match.Groups[j];- if (group.Length > 0)- {- // Skip the first two values of the enum- var color = (UIHighlightedTextSpanColor)(((j - 1) % (amountOfColorsInUIHighlightedTextSpanColor - 2)) + 2);-- highlightedSpans.Add(- new UIHighlightedTextSpan(- group.Index,- group.Length,- color));-- gridRows.Add(- Row(- group,- Cell($"\t{RegExTester.MatchGroupPrefix} {group.Name}\t"),- Cell(Label().Style(UILabelStyle.Caption).NeverWrap().Text($"{group.Index}-{group.Index + group.Length}")),- Cell(group.Value)));- }- }- }-- if (!allMatches)- {- break;- }- }-- _inputText.Highlight(highlightedSpans.ToArray());-- _matchesDataGrid.WithRows(gridRows.ToArray());- }- catch (Exception ex)- {- _logger.LogError(ex, "Error while matching regular expression.");- }- }- }-- private static RegexOptions GetRegexOptions(- bool isEcmaScript,- bool isCultureInvariant,- bool ignoreCase,- bool ignoreWhitespace,- bool singleline,- bool multiline,- bool rightToLeft)- {- RegexOptions options = RegexOptions.None;-- if (isEcmaScript)- {- options |= RegexOptions.ECMAScript;- }-- if (isCultureInvariant)- {- options |= RegexOptions.CultureInvariant;- }-- if (ignoreCase)- {- options |= RegexOptions.IgnoreCase;- }-- if (ignoreWhitespace)- {- options |= RegexOptions.IgnorePatternWhitespace;- }-- if (singleline)- {- options |= RegexOptions.Singleline;- }-- if (multiline)- {- options |= RegexOptions.Multiline;- }-- if (rightToLeft)- {- options |= RegexOptions.RightToLeft;- }-- return options;- }-- private static IUIDataGridRow CreateCheatSheetRow(string syntax, string description, string details)- => Row(- null,- details: Label().Text(details),- Cell(- Label()- .NeverWrap()- .Text(description)),- Cell(- Label()- .NeverWrap()- .Style(UILabelStyle.BodyStrong)- .Text($"\t{syntax}\t")));-- private static IUIDataGridRow CreateCheatSheetTitleRow(string title)- => Row(- null,- Cell(- Label()- .NeverWrap()- .Style(UILabelStyle.Subtitle)- .Text(title)),- Cell(Label()));-}diff --git a/src/app/dev/DevToys.Tools/Tools/Testers/Testers.Designer.cs b/src/app/dev/DevToys.Tools/Tools/Testers/Testers.Designer.csdeleted file mode 100644index 72227a978..000000000--- a/src/app/dev/DevToys.Tools/Tools/Testers/Testers.Designer.cs+++ /dev/null@@ -1,81 +0,0 @@-//-------------------------------------------------------------------------------// <auto-generated>-// This code was generated by a tool.-// Runtime Version:4.0.30319.42000-//-// Changes to this file may cause incorrect behavior and will be lost if-// the code is regenerated.-// </auto-generated>-//--------------------------------------------------------------------------------namespace DevToys.Tools.Tools.Testers {- using System;--- /// <summary>- /// A strongly-typed resource class, for looking up localized strings, etc.- /// </summary>- // This class was auto-generated by the StronglyTypedResourceBuilder- // class via a tool like ResGen or Visual Studio.- // To add or remove a member, edit your .ResX file then rerun ResGen- // with the /str option, or rebuild your VS project.- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]- internal class Testers {-- private static global::System.Resources.ResourceManager resourceMan;-- private static global::System.Globalization.CultureInfo resourceCulture;-- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]- internal Testers() {- }-- /// <summary>- /// Returns the cached ResourceManager instance used by this class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Resources.ResourceManager ResourceManager {- get {- if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Tools.Tools.Testers.Testers", typeof(Testers).Assembly);- resourceMan = temp;- }- return resourceMan;- }- }-- /// <summary>- /// Overrides the current thread's CurrentUICulture property for all- /// resource lookups using this strongly typed resource class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Globalization.CultureInfo Culture {- get {- return resourceCulture;- }- set {- resourceCulture = value;- }- }-- /// <summary>- /// Looks up a localized string similar to Testers.- /// </summary>- internal static string AccessibleName {- get {- return ResourceManager.GetString("AccessibleName", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Testers.- /// </summary>- internal static string DisplayTitle {- get {- return ResourceManager.GetString("DisplayTitle", resourceCulture);- }- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Testers/Testers.resx b/src/app/dev/DevToys.Tools/Tools/Testers/Testers.resxdeleted file mode 100644index 99ba22094..000000000--- a/src/app/dev/DevToys.Tools/Tools/Testers/Testers.resx+++ /dev/null@@ -1,126 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<root>- <!--- Microsoft ResX Schema-- Version 2.0-- The primary goals of this format is to allow a simple XML format- that is mostly human readable. The generation and parsing of the- various data types are done through the TypeConverter classes- associated with the data types.-- Example:-- ... ado.net/XML headers & schema ...- <resheader name="resmimetype">text/microsoft-resx</resheader>- <resheader name="version">2.0</resheader>- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">- <value>[base64 mime encoded serialized .NET Framework object]</value>- </data>- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>- <comment>This is a comment</comment>- </data>-- There are any number of "resheader" rows that contain simple- name/value pairs.-- Each data row contains a name, and value. The row also contains a- type or mimetype. Type corresponds to a .NET class that support- text/value conversion through the TypeConverter architecture.- Classes that don't support this are serialized and stored with the- mimetype set.-- The mimetype is used for serialized objects, and tells the- ResXResourceReader how to depersist the object. This is currently not- extensible. For a given mimetype the value must be set accordingly:-- Note - application/x-microsoft.net.object.binary.base64 is the format- that the ResXResourceWriter will generate, however the reader can- read any of the formats listed below.-- mimetype: application/x-microsoft.net.object.binary.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.soap.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.bytearray.base64- value : The object must be serialized into a byte array- : using a System.ComponentModel.TypeConverter- : and then encoded with base64 encoding.- -->- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />- <xsd:element name="root" msdata:IsDataSet="true">- <xsd:complexType>- <xsd:choice maxOccurs="unbounded">- <xsd:element name="metadata">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" />- </xsd:sequence>- <xsd:attribute name="name" use="required" type="xsd:string" />- <xsd:attribute name="type" type="xsd:string" />- <xsd:attribute name="mimetype" type="xsd:string" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="assembly">- <xsd:complexType>- <xsd:attribute name="alias" type="xsd:string" />- <xsd:attribute name="name" type="xsd:string" />- </xsd:complexType>- </xsd:element>- <xsd:element name="data">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="resheader">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" />- </xsd:complexType>- </xsd:element>- </xsd:choice>- </xsd:complexType>- </xsd:element>- </xsd:schema>- <resheader name="resmimetype">- <value>text/microsoft-resx</value>- </resheader>- <resheader name="version">- <value>2.0</value>- </resheader>- <resheader name="reader">- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <resheader name="writer">- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <data name="AccessibleName" xml:space="preserve">- <value>Testers</value>- </data>- <data name="DisplayTitle" xml:space="preserve">- <value>Testers</value>- </data>-</root>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/Testers/XMLTester/XMLTester.Designer.cs b/src/app/dev/DevToys.Tools/Tools/Testers/XMLTester/XMLTester.Designer.csdeleted file mode 100644index 876fd75f7..000000000--- a/src/app/dev/DevToys.Tools/Tools/Testers/XMLTester/XMLTester.Designer.cs+++ /dev/null@@ -1,234 +0,0 @@-//-------------------------------------------------------------------------------// <auto-generated>-// This code was generated by a tool.-// Runtime Version:4.0.30319.42000-//-// Changes to this file may cause incorrect behavior and will be lost if-// the code is regenerated.-// </auto-generated>-//--------------------------------------------------------------------------------namespace DevToys.Tools.Tools.Testers.XMLTester {- using System;--- /// <summary>- /// A strongly-typed resource class, for looking up localized strings, etc.- /// </summary>- // This class was auto-generated by the StronglyTypedResourceBuilder- // class via a tool like ResGen or Visual Studio.- // To add or remove a member, edit your .ResX file then rerun ResGen- // with the /str option, or rebuild your VS project.- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]- internal class XMLTester {-- private static global::System.Resources.ResourceManager resourceMan;-- private static global::System.Globalization.CultureInfo resourceCulture;-- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]- internal XMLTester() {- }-- /// <summary>- /// Returns the cached ResourceManager instance used by this class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Resources.ResourceManager ResourceManager {- get {- if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Tools.Tools.Testers.XMLTester.XMLTester", typeof(XMLTester).Assembly);- resourceMan = temp;- }- return resourceMan;- }- }-- /// <summary>- /// Overrides the current thread's CurrentUICulture property for all- /// resource lookups using this strongly typed resource class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Globalization.CultureInfo Culture {- get {- return resourceCulture;- }- set {- resourceCulture = value;- }- }-- /// <summary>- /// Looks up a localized string similar to Xml and XSD tester tool.- /// </summary>- internal static string AccessibleName {- get {- return ResourceManager.GetString("AccessibleName", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Validate XML data via an XSD scheme..- /// </summary>- internal static string Description {- get {- return ResourceManager.GetString("Description", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Please specify an input XML.- /// </summary>- internal static string InvalidXmlOrFileCommand {- get {- return ResourceManager.GetString("InvalidXmlOrFileCommand", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Please specify an input XSD.- /// </summary>- internal static string InvalidXsdOrFileCommand {- get {- return ResourceManager.GetString("InvalidXsdOrFileCommand", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to XML / XSD Tester.- /// </summary>- internal static string LongDisplayTitle {- get {- return ResourceManager.GetString("LongDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to XSD.- /// </summary>- internal static string SearchKeywords {- get {- return ResourceManager.GetString("SearchKeywords", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to XML.- /// </summary>- internal static string ShortDisplayTitle {- get {- return ResourceManager.GetString("ShortDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Validation result will potentially always be 'valid' since the XML does not reference the following "targetNamespace" defined in the XSD: {0}.- /// </summary>- internal static string TargetNamespaceNotDefinedInXml {- get {- return ResourceManager.GetString("TargetNamespaceNotDefinedInXml", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to XML and XSD content must be set in order to perform a validation..- /// </summary>- internal static string ValidationImpossibleMsg {- get {- return ResourceManager.GetString("ValidationImpossibleMsg", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to XML.- /// </summary>- internal static string XmlData {- get {- return ResourceManager.GetString("XmlData", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to XML file selected doesn't exist..- /// </summary>- internal static string XmlFileNotFound {- get {- return ResourceManager.GetString("XmlFileNotFound", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Validation failed for an unknown reason..- /// </summary>- internal static string XmlInvalidMessage {- get {- return ResourceManager.GetString("XmlInvalidMessage", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Validation result will always be 'valid' since the XML does not define these namespace(s) defined in the XSD: {0}.- /// </summary>- internal static string XmlNamespacesInconsistentMsg {- get {- return ResourceManager.GetString("XmlNamespacesInconsistentMsg", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Text or path to a XML file to treat..- /// </summary>- internal static string XmlOptionDescription {- get {- return ResourceManager.GetString("XmlOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to XML is compliant to the defined XSD scheme..- /// </summary>- internal static string XmlValidMessage {- get {- return ResourceManager.GetString("XmlValidMessage", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to XSD file selected doesn't exist..- /// </summary>- internal static string XsdFileNotFound {- get {- return ResourceManager.GetString("XsdFileNotFound", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Validation result will always be 'valid' since the XSD does not define these namespace(s) defined in the XML: {0}.- /// </summary>- internal static string XsdNamespacesInconsistentMsg {- get {- return ResourceManager.GetString("XsdNamespacesInconsistentMsg", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Text or path to a XSD file to treat..- /// </summary>- internal static string XsdOptionDescription {- get {- return ResourceManager.GetString("XsdOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to XSD.- /// </summary>- internal static string XsdScheme {- get {- return ResourceManager.GetString("XsdScheme", resourceCulture);- }- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Testers/XMLTester/XMLTester.resx b/src/app/dev/DevToys.Tools/Tools/Testers/XMLTester/XMLTester.resxdeleted file mode 100644index 8f7fa4569..000000000--- a/src/app/dev/DevToys.Tools/Tools/Testers/XMLTester/XMLTester.resx+++ /dev/null@@ -1,177 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<root>- <!--- Microsoft ResX Schema-- Version 2.0-- The primary goals of this format is to allow a simple XML format- that is mostly human readable. The generation and parsing of the- various data types are done through the TypeConverter classes- associated with the data types.-- Example:-- ... ado.net/XML headers & schema ...- <resheader name="resmimetype">text/microsoft-resx</resheader>- <resheader name="version">2.0</resheader>- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">- <value>[base64 mime encoded serialized .NET Framework object]</value>- </data>- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>- <comment>This is a comment</comment>- </data>-- There are any number of "resheader" rows that contain simple- name/value pairs.-- Each data row contains a name, and value. The row also contains a- type or mimetype. Type corresponds to a .NET class that support- text/value conversion through the TypeConverter architecture.- Classes that don't support this are serialized and stored with the- mimetype set.-- The mimetype is used for serialized objects, and tells the- ResXResourceReader how to depersist the object. This is currently not- extensible. For a given mimetype the value must be set accordingly:-- Note - application/x-microsoft.net.object.binary.base64 is the format- that the ResXResourceWriter will generate, however the reader can- read any of the formats listed below.-- mimetype: application/x-microsoft.net.object.binary.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.soap.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.bytearray.base64- value : The object must be serialized into a byte array- : using a System.ComponentModel.TypeConverter- : and then encoded with base64 encoding.- -->- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />- <xsd:element name="root" msdata:IsDataSet="true">- <xsd:complexType>- <xsd:choice maxOccurs="unbounded">- <xsd:element name="metadata">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" />- </xsd:sequence>- <xsd:attribute name="name" use="required" type="xsd:string" />- <xsd:attribute name="type" type="xsd:string" />- <xsd:attribute name="mimetype" type="xsd:string" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="assembly">- <xsd:complexType>- <xsd:attribute name="alias" type="xsd:string" />- <xsd:attribute name="name" type="xsd:string" />- </xsd:complexType>- </xsd:element>- <xsd:element name="data">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="resheader">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" />- </xsd:complexType>- </xsd:element>- </xsd:choice>- </xsd:complexType>- </xsd:element>- </xsd:schema>- <resheader name="resmimetype">- <value>text/microsoft-resx</value>- </resheader>- <resheader name="version">- <value>2.0</value>- </resheader>- <resheader name="reader">- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <resheader name="writer">- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <data name="AccessibleName" xml:space="preserve">- <value>Xml and XSD tester tool</value>- </data>- <data name="Description" xml:space="preserve">- <value>Validate XML data via an XSD scheme.</value>- </data>- <data name="LongDisplayTitle" xml:space="preserve">- <value>XML / XSD Tester</value>- </data>- <data name="SearchKeywords" xml:space="preserve">- <value>XSD</value>- </data>- <data name="ShortDisplayTitle" xml:space="preserve">- <value>XML</value>- </data>- <data name="XsdScheme" xml:space="preserve">- <value>XSD</value>- </data>- <data name="XmlData" xml:space="preserve">- <value>XML</value>- </data>- <data name="TargetNamespaceNotDefinedInXml" xml:space="preserve">- <value>Validation result will potentially always be 'valid' since the XML does not reference the following "targetNamespace" defined in the XSD: {0}</value>- </data>- <data name="ValidationImpossibleMsg" xml:space="preserve">- <value>XML and XSD content must be set in order to perform a validation.</value>- </data>- <data name="XmlInvalidMessage" xml:space="preserve">- <value>Validation failed for an unknown reason.</value>- </data>- <data name="XmlNamespacesInconsistentMsg" xml:space="preserve">- <value>Validation result will always be 'valid' since the XML does not define these namespace(s) defined in the XSD: {0}</value>- </data>- <data name="XmlValidMessage" xml:space="preserve">- <value>XML is compliant to the defined XSD scheme.</value>- </data>- <data name="XsdNamespacesInconsistentMsg" xml:space="preserve">- <value>Validation result will always be 'valid' since the XSD does not define these namespace(s) defined in the XML: {0}</value>- </data>- <data name="InvalidXmlOrFileCommand" xml:space="preserve">- <value>Please specify an input XML</value>- </data>- <data name="InvalidXsdOrFileCommand" xml:space="preserve">- <value>Please specify an input XSD</value>- </data>- <data name="XmlFileNotFound" xml:space="preserve">- <value>XML file selected doesn't exist.</value>- </data>- <data name="XmlOptionDescription" xml:space="preserve">- <value>Text or path to a XML file to treat.</value>- </data>- <data name="XsdFileNotFound" xml:space="preserve">- <value>XSD file selected doesn't exist.</value>- </data>- <data name="XsdOptionDescription" xml:space="preserve">- <value>Text or path to a XSD file to treat.</value>- </data>-</root>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/Testers/XMLTester/XMLTesterCommandLineTool.cs b/src/app/dev/DevToys.Tools/Tools/Testers/XMLTester/XMLTesterCommandLineTool.csdeleted file mode 100644index 37cb4c5cf..000000000--- a/src/app/dev/DevToys.Tools/Tools/Testers/XMLTester/XMLTesterCommandLineTool.cs+++ /dev/null@@ -1,93 +0,0 @@-using DevToys.Tools.Helpers;-using DevToys.Tools.Models;-using Microsoft.Extensions.Logging;-using OneOf;--namespace DevToys.Tools.Tools.Testers.XMLTester;--[Export(typeof(ICommandLineTool))]-[Name("XMLTester")]-[CommandName(- Name = "xmltester",- Alias = "xsd",- ResourceManagerBaseName = "DevToys.Tools.Tools.Testers.XMLTester.XMLTester",- DescriptionResourceName = nameof(XMLTester.Description))]-internal sealed class XMLTesterCommandLineTool : ICommandLineTool-{-#pragma warning disable IDE0044 // Add readonly modifier- [Import]- private IFileStorage _fileStorage = null!;-#pragma warning restore IDE0044 // Add readonly modifier-- [CommandLineOption(- Name = "xsd",- Alias = "s",- IsRequired = true,- DescriptionResourceName = nameof(XMLTester.XsdOptionDescription))]- private OneOf<FileInfo, string>? XsdFile { get; set; }-- [CommandLineOption(- Name = "xml",- Alias = "x",- IsRequired = true,- DescriptionResourceName = nameof(XMLTester.XmlOptionDescription))]- private OneOf<FileInfo, string>? XmlFile { get; set; }-- public async ValueTask<int> InvokeAsync(ILogger logger, CancellationToken cancellationToken)- {- if (!XsdFile.HasValue)- {- Console.Error.WriteLine(XMLTester.InvalidXsdOrFileCommand);- return -1;- }-- ResultInfo<string> xsd = await XsdFile.Value.ReadAllTextAsync(_fileStorage, cancellationToken);- if (!xsd.HasSucceeded)- {- Console.Error.WriteLine(XMLTester.XsdFileNotFound);- return -1;- }-- if (!XmlFile.HasValue)- {- Console.Error.WriteLine(XMLTester.InvalidXmlOrFileCommand);- return -1;- }-- ResultInfo<string> xml = await XmlFile.Value.ReadAllTextAsync(_fileStorage, cancellationToken);- if (!xml.HasSucceeded)- {- Console.Error.WriteLine(XMLTester.XmlFileNotFound);- return -1;- }-- ResultInfo<string, XMLTesterResultSeverity> result = XsdHelper.ValidateXmlAgainstXsd(xsd.Data, xml.Data, logger, cancellationToken);-- switch (result.Severity)- {- case XMLTesterResultSeverity.Success:- return 0;-- case XMLTesterResultSeverity.Warning:- Console.Error.WriteLine(result.Data);- return -1;-- case XMLTesterResultSeverity.Error:- string errorDescription;- if (string.IsNullOrWhiteSpace(result.Data))- {- errorDescription = XMLTester.XmlInvalidMessage;- }- else- {- errorDescription = result.Data;- }-- Console.Error.WriteLine(errorDescription);- return -1;-- default:- throw new NotImplementedException();- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Testers/XMLTester/XMLTesterGuiTool.cs b/src/app/dev/DevToys.Tools/Tools/Testers/XMLTester/XMLTesterGuiTool.csdeleted file mode 100644index 86cab596d..000000000--- a/src/app/dev/DevToys.Tools/Tools/Testers/XMLTester/XMLTesterGuiTool.cs+++ /dev/null@@ -1,172 +0,0 @@-using DevToys.Tools.Helpers;-using DevToys.Tools.Models;-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.Tools.Testers.XMLTester;--[Export(typeof(IGuiTool))]-[Name("XMLTester")]-[ToolDisplayInformation(- IconFontName = "DevToys-Tools-Icons",- IconGlyph = '\u0116',- GroupName = PredefinedCommonToolGroupNames.Testers,- ResourceManagerAssemblyIdentifier = nameof(DevToysToolsResourceManagerAssemblyIdentifier),- ResourceManagerBaseName = "DevToys.Tools.Tools.Testers.XMLTester.XMLTester",- ShortDisplayTitleResourceName = nameof(XMLTester.ShortDisplayTitle),- LongDisplayTitleResourceName = nameof(XMLTester.LongDisplayTitle),- DescriptionResourceName = nameof(XMLTester.Description),- AccessibleNameResourceName = nameof(XMLTester.AccessibleName),- SearchKeywordsResourceName = nameof(XMLTester.SearchKeywords))]-[AcceptedDataTypeName(PredefinedCommonDataTypeNames.Xml)]-[AcceptedDataTypeName(PredefinedCommonDataTypeNames.Xsd)]-internal sealed class XMLTesterGuiTool : IGuiTool, IDisposable-{- private enum GridRows- {- TopStretch,- BottomAuto,- }-- private enum GridColumns- {- Stretch- }-- private readonly ILogger _logger;- private readonly DisposableSemaphore _semaphore = new();- private readonly IUIMultiLineTextInput _xsdInputText = MultilineTextInput();- private readonly IUIMultiLineTextInput _xmlInputText = MultilineTextInput();- private readonly IUIInfoBar _infoBar = InfoBar();-- private CancellationTokenSource? _cancellationTokenSource;-- [ImportingConstructor]- internal XMLTesterGuiTool()- {- _logger = this.Log();- }-- // For unit tests.- internal Task? WorkTask { get; private set; }-- public UIToolView View- => new(- isScrollable: false,- Grid()- .ColumnMediumSpacing()-- .Rows(- (GridRows.TopStretch, new UIGridLength(1, UIGridUnitType.Fraction)),- (GridRows.BottomAuto, Auto))-- .Columns(- (GridColumns.Stretch, new UIGridLength(1, UIGridUnitType.Fraction)))-- .Cells(- Cell(- GridRows.TopStretch,- GridColumns.Stretch,-- SplitGrid()- .Vertical()- .WithLeftPaneChild(- _xsdInputText- .Title(XMLTester.XsdScheme)- .Language("xml")- .CanCopyWhenEditable()- .Extendable()- .OnTextChanged(OnInputChanged))-- .WithRightPaneChild(- _xmlInputText- .Title(XMLTester.XmlData)- .Language("xml")- .CanCopyWhenEditable()- .Extendable()- .OnTextChanged(OnInputChanged))),-- Cell(- GridRows.BottomAuto,- GridColumns.Stretch,-- _infoBar- .NonClosable()- .Open())));-- public void Dispose()- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _semaphore.Dispose();- }-- public void OnDataReceived(string dataTypeName, object? parsedData)- {- if (dataTypeName == PredefinedCommonDataTypeNames.Xml && parsedData is string xml)- {- _xmlInputText.Text(xml);- }- else if (dataTypeName == PredefinedCommonDataTypeNames.Xsd && parsedData is string xsd)- {- _xsdInputText.Text(xsd);- }- }-- private void OnInputChanged(string _)- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _cancellationTokenSource = new CancellationTokenSource();-- WorkTask = ValidateAsync(_xsdInputText.Text, _xmlInputText.Text, _cancellationTokenSource.Token);- }-- private async Task ValidateAsync(string xsd, string xml, CancellationToken cancellationToken)- {- if (string.IsNullOrWhiteSpace(xsd) || string.IsNullOrWhiteSpace(xml))- {- _infoBar- .Description(XMLTester.ValidationImpossibleMsg)- .Informational();- return;- }-- await TaskSchedulerAwaiter.SwitchOffMainThreadAsync(cancellationToken);-- ResultInfo<string, XMLTesterResultSeverity> result = XsdHelper.ValidateXmlAgainstXsd(xsd, xml, _logger, cancellationToken);-- switch (result.Severity)- {- case XMLTesterResultSeverity.Success:- _infoBar- .Description(XMLTester.XmlValidMessage)- .Success();- break;-- case XMLTesterResultSeverity.Warning:- _infoBar- .Description(result.Data)- .Warning();- break;-- case XMLTesterResultSeverity.Error:- string errorDescription;- if (string.IsNullOrWhiteSpace(result.Data))- {- errorDescription = XMLTester.XmlInvalidMessage;- }- else- {- errorDescription = result.Data;- }-- _infoBar- .Description(errorDescription)- .Error();- break;-- default:- throw new NotImplementedException();- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Text/AnalyzerAndUtilities/AnalyzerAndUtilities.Designer.cs b/src/app/dev/DevToys.Tools/Tools/Text/AnalyzerAndUtilities/AnalyzerAndUtilities.Designer.csdeleted file mode 100644index ea538ecc6..000000000--- a/src/app/dev/DevToys.Tools/Tools/Text/AnalyzerAndUtilities/AnalyzerAndUtilities.Designer.cs+++ /dev/null@@ -1,594 +0,0 @@-//-------------------------------------------------------------------------------// <auto-generated>-// This code was generated by a tool.-// Runtime Version:4.0.30319.42000-//-// Changes to this file may cause incorrect behavior and will be lost if-// the code is regenerated.-// </auto-generated>-//--------------------------------------------------------------------------------namespace DevToys.Tools.Tools.Text.AnalyzerAndUtilities {- using System;--- /// <summary>- /// A strongly-typed resource class, for looking up localized strings, etc.- /// </summary>- // This class was auto-generated by the StronglyTypedResourceBuilder- // class via a tool like ResGen or Visual Studio.- // To add or remove a member, edit your .ResX file then rerun ResGen- // with the /str option, or rebuild your VS project.- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]- internal class AnalyzerAndUtilities {-- private static global::System.Resources.ResourceManager resourceMan;-- private static global::System.Globalization.CultureInfo resourceCulture;-- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]- internal AnalyzerAndUtilities() {- }-- /// <summary>- /// Returns the cached ResourceManager instance used by this class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Resources.ResourceManager ResourceManager {- get {- if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Tools.Tools.Text.AnalyzerAndUtilities.AnalyzerAndUtilities", typeof(AnalyzerAndUtilities).Assembly);- resourceMan = temp;- }- return resourceMan;- }- }-- /// <summary>- /// Overrides the current thread's CurrentUICulture property for all- /// resource lookups using this strongly typed resource class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Globalization.CultureInfo Culture {- get {- return resourceCulture;- }- set {- resourceCulture = value;- }- }-- /// <summary>- /// Looks up a localized string similar to Text analyzer, converter and utilities tool.- /// </summary>- internal static string AccessibleName {- get {- return ResourceManager.GetString("AccessibleName", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to A set of treatments to apply to the input text. Actions are performed in the order they're set..- /// </summary>- internal static string ActionsOptionDescription {- get {- return ResourceManager.GetString("ActionsOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Alphabetize.- /// </summary>- internal static string Alphabetize {- get {- return ResourceManager.GetString("Alphabetize", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Alphabetize by last word.- /// </summary>- internal static string AlphabetizeLast {- get {- return ResourceManager.GetString("AlphabetizeLast", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to aLtErNaTiNg cAsE.- /// </summary>- internal static string AlternatingCase {- get {- return ResourceManager.GetString("AlternatingCase", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Bytes.- /// </summary>- internal static string Bytes {- get {- return ResourceManager.GetString("Bytes", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to camelCase.- /// </summary>- internal static string CamelCase {- get {- return ResourceManager.GetString("CamelCase", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Character frequency.- /// </summary>- internal static string CharacterFrequency {- get {- return ResourceManager.GetString("CharacterFrequency", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Characters.- /// </summary>- internal static string Characters {- get {- return ResourceManager.GetString("Characters", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to COBOL-CASE.- /// </summary>- internal static string CobolCase {- get {- return ResourceManager.GetString("CobolCase", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to CONSTANT_CASE.- /// </summary>- internal static string ConstantCase {- get {- return ResourceManager.GetString("ConstantCase", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Convert case.- /// </summary>- internal static string ConvertCase {- get {- return ResourceManager.GetString("ConvertCase", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Convert line break.- /// </summary>- internal static string ConvertEndOfLineSequence {- get {- return ResourceManager.GetString("ConvertEndOfLineSequence", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Analyze text and provide some basic utility tools.- /// </summary>- internal static string Description {- get {- return ResourceManager.GetString("Description", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Line break.- /// </summary>- internal static string EndOfLineSequence {- get {- return ResourceManager.GetString("EndOfLineSequence", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to CR (\r).- /// </summary>- internal static string EndOfLineSequenceCR {- get {- return ResourceManager.GetString("EndOfLineSequenceCR", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to CRLF (\r\n).- /// </summary>- internal static string EndOfLineSequenceCRLF {- get {- return ResourceManager.GetString("EndOfLineSequenceCRLF", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to LF (\n).- /// </summary>- internal static string EndOfLineSequenceLF {- get {- return ResourceManager.GetString("EndOfLineSequenceLF", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Mixed.- /// </summary>- internal static string EndOfLineSequenceMixed {- get {- return ResourceManager.GetString("EndOfLineSequenceMixed", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Unknown.- /// </summary>- internal static string EndOfLineSequenceUnknown {- get {- return ResourceManager.GetString("EndOfLineSequenceUnknown", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Input file selected doesn't exist..- /// </summary>- internal static string InputFileNotFound {- get {- return ResourceManager.GetString("InputFileNotFound", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Text or path to a file to treat..- /// </summary>- internal static string InputOptionDescription {- get {- return ResourceManager.GetString("InputOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Please specify an input text or an input file.- /// </summary>- internal static string InvalidInputOrFileCommand {- get {- return ResourceManager.GetString("InvalidInputOrFileCommand", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to InVeRsE CaSe.- /// </summary>- internal static string InverseCase {- get {- return ResourceManager.GetString("InverseCase", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to kebab-case.- /// </summary>- internal static string KebabCase {- get {- return ResourceManager.GetString("KebabCase", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Lines.- /// </summary>- internal static string Lines {- get {- return ResourceManager.GetString("Lines", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Text Analyzer and Utilities.- /// </summary>- internal static string LongDisplayTitle {- get {- return ResourceManager.GetString("LongDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to lower case.- /// </summary>- internal static string LowerCase {- get {- return ResourceManager.GetString("LowerCase", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Path to the output file.- /// </summary>- internal static string OutputFileOptionDescription {- get {- return ResourceManager.GetString("OutputFileOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Paragraphs.- /// </summary>- internal static string Paragraphs {- get {- return ResourceManager.GetString("Paragraphs", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to PascalCase.- /// </summary>- internal static string PascalCase {- get {- return ResourceManager.GetString("PascalCase", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to raNdoM cASe.- /// </summary>- internal static string RandomCase {- get {- return ResourceManager.GetString("RandomCase", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Randomize.- /// </summary>- internal static string Randomize {- get {- return ResourceManager.GetString("Randomize", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Reverse.- /// </summary>- internal static string Reverse {- get {- return ResourceManager.GetString("Reverse", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Reverse alphabetize.- /// </summary>- internal static string ReverseAlphabetize {- get {- return ResourceManager.GetString("ReverseAlphabetize", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Reverse alphabetize by last word.- /// </summary>- internal static string ReverseAlphabetizeLast {- get {- return ResourceManager.GetString("ReverseAlphabetizeLast", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to string.- /// </summary>- internal static string SearchKeywords {- get {- return ResourceManager.GetString("SearchKeywords", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Column.- /// </summary>- internal static string SelectionColumnNumber {- get {- return ResourceManager.GetString("SelectionColumnNumber", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to End position.- /// </summary>- internal static string SelectionEndPosition {- get {- return ResourceManager.GetString("SelectionEndPosition", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Length.- /// </summary>- internal static string SelectionLength {- get {- return ResourceManager.GetString("SelectionLength", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Line.- /// </summary>- internal static string SelectionLineNumber {- get {- return ResourceManager.GetString("SelectionLineNumber", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Start position.- /// </summary>- internal static string SelectionStartPosition {- get {- return ResourceManager.GetString("SelectionStartPosition", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Selection.- /// </summary>- internal static string SelectionStatistics {- get {- return ResourceManager.GetString("SelectionStatistics", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Sentence case.- /// </summary>- internal static string SentenceCase {- get {- return ResourceManager.GetString("SentenceCase", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Sentences.- /// </summary>- internal static string Sentences {- get {- return ResourceManager.GetString("Sentences", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Analyzer & Utilities.- /// </summary>- internal static string ShortDisplayTitle {- get {- return ResourceManager.GetString("ShortDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Show original text.- /// </summary>- internal static string ShowOriginalText {- get {- return ResourceManager.GetString("ShowOriginalText", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to snake_case.- /// </summary>- internal static string SnakeCase {- get {- return ResourceManager.GetString("SnakeCase", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Sort lines.- /// </summary>- internal static string SortLines {- get {- return ResourceManager.GetString("SortLines", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Statistics.- /// </summary>- internal static string Statistics {- get {- return ResourceManager.GetString("Statistics", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Title.- /// </summary>- internal static string StatisticTitle {- get {- return ResourceManager.GetString("StatisticTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Value.- /// </summary>- internal static string StatisticValue {- get {- return ResourceManager.GetString("StatisticValue", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Text.- /// </summary>- internal static string TextInput {- get {- return ResourceManager.GetString("TextInput", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Text.- /// </summary>- internal static string TextStatistics {- get {- return ResourceManager.GetString("TextStatistics", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Title Case.- /// </summary>- internal static string TitleCase {- get {- return ResourceManager.GetString("TitleCase", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Train-Case.- /// </summary>- internal static string TrainCase {- get {- return ResourceManager.GetString("TrainCase", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to UPPER CASE.- /// </summary>- internal static string UpperCase {- get {- return ResourceManager.GetString("UpperCase", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Word frequency.- /// </summary>- internal static string WordFrequency {- get {- return ResourceManager.GetString("WordFrequency", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Words.- /// </summary>- internal static string Words {- get {- return ResourceManager.GetString("Words", resourceCulture);- }- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Text/AnalyzerAndUtilities/AnalyzerAndUtilities.resx b/src/app/dev/DevToys.Tools/Tools/Text/AnalyzerAndUtilities/AnalyzerAndUtilities.resxdeleted file mode 100644index 73ecae1ef..000000000--- a/src/app/dev/DevToys.Tools/Tools/Text/AnalyzerAndUtilities/AnalyzerAndUtilities.resx+++ /dev/null@@ -1,297 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<root>- <!--- Microsoft ResX Schema-- Version 2.0-- The primary goals of this format is to allow a simple XML format- that is mostly human readable. The generation and parsing of the- various data types are done through the TypeConverter classes- associated with the data types.-- Example:-- ... ado.net/XML headers & schema ...- <resheader name="resmimetype">text/microsoft-resx</resheader>- <resheader name="version">2.0</resheader>- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">- <value>[base64 mime encoded serialized .NET Framework object]</value>- </data>- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>- <comment>This is a comment</comment>- </data>-- There are any number of "resheader" rows that contain simple- name/value pairs.-- Each data row contains a name, and value. The row also contains a- type or mimetype. Type corresponds to a .NET class that support- text/value conversion through the TypeConverter architecture.- Classes that don't support this are serialized and stored with the- mimetype set.-- The mimetype is used for serialized objects, and tells the- ResXResourceReader how to depersist the object. This is currently not- extensible. For a given mimetype the value must be set accordingly:-- Note - application/x-microsoft.net.object.binary.base64 is the format- that the ResXResourceWriter will generate, however the reader can- read any of the formats listed below.-- mimetype: application/x-microsoft.net.object.binary.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.soap.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.bytearray.base64- value : The object must be serialized into a byte array- : using a System.ComponentModel.TypeConverter- : and then encoded with base64 encoding.- -->- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />- <xsd:element name="root" msdata:IsDataSet="true">- <xsd:complexType>- <xsd:choice maxOccurs="unbounded">- <xsd:element name="metadata">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" />- </xsd:sequence>- <xsd:attribute name="name" use="required" type="xsd:string" />- <xsd:attribute name="type" type="xsd:string" />- <xsd:attribute name="mimetype" type="xsd:string" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="assembly">- <xsd:complexType>- <xsd:attribute name="alias" type="xsd:string" />- <xsd:attribute name="name" type="xsd:string" />- </xsd:complexType>- </xsd:element>- <xsd:element name="data">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="resheader">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" />- </xsd:complexType>- </xsd:element>- </xsd:choice>- </xsd:complexType>- </xsd:element>- </xsd:schema>- <resheader name="resmimetype">- <value>text/microsoft-resx</value>- </resheader>- <resheader name="version">- <value>2.0</value>- </resheader>- <resheader name="reader">- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <resheader name="writer">- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <data name="AccessibleName" xml:space="preserve">- <value>Text analyzer, converter and utilities tool</value>- </data>- <data name="ActionsOptionDescription" xml:space="preserve">- <value>A set of treatments to apply to the input text. Actions are performed in the order they're set.</value>- </data>- <data name="Alphabetize" xml:space="preserve">- <value>Alphabetize</value>- </data>- <data name="AlphabetizeLast" xml:space="preserve">- <value>Alphabetize by last word</value>- </data>- <data name="AlternatingCase" xml:space="preserve">- <value>aLtErNaTiNg cAsE</value>- </data>- <data name="Bytes" xml:space="preserve">- <value>Bytes</value>- </data>- <data name="CamelCase" xml:space="preserve">- <value>camelCase</value>- </data>- <data name="CharacterFrequency" xml:space="preserve">- <value>Character frequency</value>- </data>- <data name="Characters" xml:space="preserve">- <value>Characters</value>- </data>- <data name="CobolCase" xml:space="preserve">- <value>COBOL-CASE</value>- </data>- <data name="ConstantCase" xml:space="preserve">- <value>CONSTANT_CASE</value>- </data>- <data name="ConvertCase" xml:space="preserve">- <value>Convert case</value>- </data>- <data name="ConvertEndOfLineSequence" xml:space="preserve">- <value>Convert line break</value>- </data>- <data name="Description" xml:space="preserve">- <value>Analyze text and provide some basic utility tools</value>- </data>- <data name="EndOfLineSequence" xml:space="preserve">- <value>Line break</value>- </data>- <data name="EndOfLineSequenceCR" xml:space="preserve">- <value>CR (\r)</value>- </data>- <data name="EndOfLineSequenceCRLF" xml:space="preserve">- <value>CRLF (\r\n)</value>- </data>- <data name="EndOfLineSequenceLF" xml:space="preserve">- <value>LF (\n)</value>- </data>- <data name="EndOfLineSequenceMixed" xml:space="preserve">- <value>Mixed</value>- </data>- <data name="EndOfLineSequenceUnknown" xml:space="preserve">- <value>Unknown</value>- </data>- <data name="InputFileNotFound" xml:space="preserve">- <value>Input file selected doesn't exist.</value>- </data>- <data name="InputOptionDescription" xml:space="preserve">- <value>Text or path to a file to treat.</value>- </data>- <data name="InvalidInputOrFileCommand" xml:space="preserve">- <value>Please specify an input text or an input file</value>- </data>- <data name="InverseCase" xml:space="preserve">- <value>InVeRsE CaSe</value>- </data>- <data name="KebabCase" xml:space="preserve">- <value>kebab-case</value>- </data>- <data name="Lines" xml:space="preserve">- <value>Lines</value>- </data>- <data name="LongDisplayTitle" xml:space="preserve">- <value>Text Analyzer and Utilities</value>- </data>- <data name="LowerCase" xml:space="preserve">- <value>lower case</value>- </data>- <data name="OutputFileOptionDescription" xml:space="preserve">- <value>Path to the output file</value>- </data>- <data name="Paragraphs" xml:space="preserve">- <value>Paragraphs</value>- </data>- <data name="PascalCase" xml:space="preserve">- <value>PascalCase</value>- </data>- <data name="RandomCase" xml:space="preserve">- <value>raNdoM cASe</value>- </data>- <data name="Randomize" xml:space="preserve">- <value>Randomize</value>- </data>- <data name="Reverse" xml:space="preserve">- <value>Reverse</value>- </data>- <data name="ReverseAlphabetize" xml:space="preserve">- <value>Reverse alphabetize</value>- </data>- <data name="ReverseAlphabetizeLast" xml:space="preserve">- <value>Reverse alphabetize by last word</value>- </data>- <data name="SearchKeywords" xml:space="preserve">- <value>string</value>- </data>- <data name="SelectionColumnNumber" xml:space="preserve">- <value>Column</value>- </data>- <data name="SelectionEndPosition" xml:space="preserve">- <value>End position</value>- </data>- <data name="SelectionLength" xml:space="preserve">- <value>Length</value>- </data>- <data name="SelectionLineNumber" xml:space="preserve">- <value>Line</value>- </data>- <data name="SelectionStartPosition" xml:space="preserve">- <value>Start position</value>- </data>- <data name="SelectionStatistics" xml:space="preserve">- <value>Selection</value>- </data>- <data name="SentenceCase" xml:space="preserve">- <value>Sentence case</value>- </data>- <data name="Sentences" xml:space="preserve">- <value>Sentences</value>- </data>- <data name="ShortDisplayTitle" xml:space="preserve">- <value>Analyzer & Utilities</value>- </data>- <data name="ShowOriginalText" xml:space="preserve">- <value>Show original text</value>- </data>- <data name="SnakeCase" xml:space="preserve">- <value>snake_case</value>- </data>- <data name="SortLines" xml:space="preserve">- <value>Sort lines</value>- </data>- <data name="Statistics" xml:space="preserve">- <value>Statistics</value>- </data>- <data name="StatisticTitle" xml:space="preserve">- <value>Title</value>- </data>- <data name="StatisticValue" xml:space="preserve">- <value>Value</value>- </data>- <data name="TextInput" xml:space="preserve">- <value>Text</value>- </data>- <data name="TextStatistics" xml:space="preserve">- <value>Text</value>- </data>- <data name="TitleCase" xml:space="preserve">- <value>Title Case</value>- </data>- <data name="TrainCase" xml:space="preserve">- <value>Train-Case</value>- </data>- <data name="UpperCase" xml:space="preserve">- <value>UPPER CASE</value>- </data>- <data name="WordFrequency" xml:space="preserve">- <value>Word frequency</value>- </data>- <data name="Words" xml:space="preserve">- <value>Words</value>- </data>-</root>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/Text/AnalyzerAndUtilities/AnalyzerAndUtilitiesCommandLineTool.cs b/src/app/dev/DevToys.Tools/Tools/Text/AnalyzerAndUtilities/AnalyzerAndUtilitiesCommandLineTool.csdeleted file mode 100644index f4fa16a16..000000000--- a/src/app/dev/DevToys.Tools/Tools/Text/AnalyzerAndUtilities/AnalyzerAndUtilitiesCommandLineTool.cs+++ /dev/null@@ -1,143 +0,0 @@-using DevToys.Tools.Helpers;-using Microsoft.Extensions.Logging;-using OneOf;--namespace DevToys.Tools.Tools.Text.AnalyzerAndUtilities;--[Export(typeof(ICommandLineTool))]-[Name("AnalyzerAndUtilities")]-[CommandName(- Name = "textutilities",- Alias = "txt",- ResourceManagerBaseName = "DevToys.Tools.Tools.Text.AnalyzerAndUtilities.AnalyzerAndUtilities",- DescriptionResourceName = nameof(AnalyzerAndUtilities.Description))]-internal sealed class AnalyzerAndUtilitiesCommandLineTool : ICommandLineTool-{- private enum OperationType- {- ConvertLineBreakToLF,- ConvertLineBreakToCRLF,- LowerCase,- UpperCase,- SentenceCase,- TitleCase,- CamelCase,- PascalCase,- SnakeCase,- ConstantCase,- KebabCase,- CobolCase,- TrainCase,- AlternatingCase,- InverseCase,- RandomCase,- SortLinesAlphabetically,- SortLinesAlphabeticallyDescending,- SortLinesByLastWord,- SortLinesByLastWordDescending,- ReverseLines,- ShuffleLines,- }--#pragma warning disable IDE0044 // Add readonly modifier- [Import]- private IFileStorage _fileStorage = null!;-#pragma warning restore IDE0044 // Add readonly modifier-- [CommandLineOption(- Name = "input",- Alias = "i",- IsRequired = true,- DescriptionResourceName = nameof(AnalyzerAndUtilities.InputOptionDescription))]- private OneOf<FileInfo, string>? Input { get; set; }-- [CommandLineOption(- Name = "action",- Alias = "a",- IsRequired = true,- DescriptionResourceName = nameof(AnalyzerAndUtilities.ActionsOptionDescription))]- private OperationType[] Actions { get; set; } = Array.Empty<OperationType>();-- [CommandLineOption(- Name = "outputFile",- Alias = "o",- DescriptionResourceName = nameof(AnalyzerAndUtilities.OutputFileOptionDescription))]- internal FileInfo? OutputFile { get; set; }-- public async ValueTask<int> InvokeAsync(ILogger logger, CancellationToken cancellationToken)- {- if (!Input.HasValue)- {- Console.Error.WriteLine(AnalyzerAndUtilities.InvalidInputOrFileCommand);- return -1;- }-- ResultInfo<string> input = await Input.Value.ReadAllTextAsync(_fileStorage, cancellationToken);- if (!input.HasSucceeded)- {- Console.Error.WriteLine(AnalyzerAndUtilities.InputFileNotFound);- return -1;- }-- Guard.IsNotNull(input.Data);-- string newText = input.Data;- for (int i = 0; i < Actions.Length; i++)- {- cancellationToken.ThrowIfCancellationRequested();-- OperationType action = Actions[i];- newText = action switch- {- OperationType.ConvertLineBreakToLF- => StringHelper.ConvertLineBreakToLF(newText),- OperationType.ConvertLineBreakToCRLF- => StringHelper.ConvertLineBreakToCRLF(newText),- OperationType.LowerCase- => newText.ToLowerInvariant(),- OperationType.UpperCase- => newText.ToUpperInvariant(),- OperationType.SentenceCase- => StringHelper.ConvertToSentenceCase(newText, cancellationToken),- OperationType.TitleCase- => StringHelper.ConvertToTitleCase(newText, cancellationToken),- OperationType.CamelCase- => StringHelper.ConvertToCamelCase(newText, cancellationToken),- OperationType.PascalCase- => StringHelper.ConvertToPascalCase(newText, cancellationToken),- OperationType.SnakeCase- => StringHelper.ConvertToSnakeCase(newText, cancellationToken),- OperationType.ConstantCase- => StringHelper.ConvertToConstantCase(newText, cancellationToken),- OperationType.KebabCase- => StringHelper.ConvertToKebabCase(newText, cancellationToken),- OperationType.CobolCase- => StringHelper.ConvertToCobolCase(newText, cancellationToken),- OperationType.TrainCase- => StringHelper.ConvertToTrainCase(newText, cancellationToken),- OperationType.AlternatingCase- => StringHelper.ConvertToAlternatingCase(newText, cancellationToken),- OperationType.InverseCase- => StringHelper.ConvertToInverseCase(newText, cancellationToken),- OperationType.RandomCase- => StringHelper.ConvertToRandomCase(newText, cancellationToken),- OperationType.SortLinesAlphabetically- => StringHelper.SortLinesAlphabetically(newText, StringHelper.DetectLineBreakKind(newText, cancellationToken)),- OperationType.SortLinesAlphabeticallyDescending- => StringHelper.SortLinesAlphabeticallyDescending(newText, StringHelper.DetectLineBreakKind(newText, cancellationToken)),- OperationType.SortLinesByLastWord- => StringHelper.SortLinesByLastWord(newText, StringHelper.DetectLineBreakKind(newText, cancellationToken)),- OperationType.SortLinesByLastWordDescending- => StringHelper.SortLinesByLastWordDescending(newText, StringHelper.DetectLineBreakKind(newText, cancellationToken)),- OperationType.ReverseLines- => StringHelper.ReverseLines(newText, StringHelper.DetectLineBreakKind(newText, cancellationToken)),- OperationType.ShuffleLines- => StringHelper.ShuffleLines(newText, StringHelper.DetectLineBreakKind(newText, cancellationToken)),- _ => throw new NotSupportedException(),- };- }-- await FileHelper.WriteOutputAsync(newText, OutputFile, cancellationToken);- return 0;- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Text/AnalyzerAndUtilities/AnalyzerAndUtilitiesGuiTool.cs b/src/app/dev/DevToys.Tools/Tools/Text/AnalyzerAndUtilities/AnalyzerAndUtilitiesGuiTool.csdeleted file mode 100644index 348e7ba64..000000000--- a/src/app/dev/DevToys.Tools/Tools/Text/AnalyzerAndUtilities/AnalyzerAndUtilitiesGuiTool.cs+++ /dev/null@@ -1,485 +0,0 @@-using System.Text.RegularExpressions;-using DevToys.Tools.Helpers;-using DevToys.Tools.Models;--namespace DevToys.Tools.Tools.Text.AnalyzerAndUtilities;--[Export(typeof(IGuiTool))]-[Name("TextAnalyzerAndUtilities")]-[ToolDisplayInformation(- IconFontName = "DevToys-Tools-Icons",- IconGlyph = '\u0131',- GroupName = PredefinedCommonToolGroupNames.Text,- ResourceManagerAssemblyIdentifier = nameof(DevToysToolsResourceManagerAssemblyIdentifier),- ResourceManagerBaseName = "DevToys.Tools.Tools.Text.AnalyzerAndUtilities.AnalyzerAndUtilities",- ShortDisplayTitleResourceName = nameof(AnalyzerAndUtilities.ShortDisplayTitle),- LongDisplayTitleResourceName = nameof(AnalyzerAndUtilities.LongDisplayTitle),- DescriptionResourceName = nameof(AnalyzerAndUtilities.Description),- AccessibleNameResourceName = nameof(AnalyzerAndUtilities.AccessibleName),- SearchKeywordsResourceName = nameof(AnalyzerAndUtilities.SearchKeywords))]-[AcceptedDataTypeName(PredefinedCommonDataTypeNames.Text)]-internal sealed class AnalyzerAndUtilitiesGuiTool : IGuiTool, IDisposable-{- private enum GridRows- {- TopAuto,- Stretch,- }-- private enum GridColumns- {- Stretch- }-- private readonly IUIMultiLineTextInput _textInput = MultilineTextInput();- private readonly IUISelectDropDownList _endOfLineSequenceDropDownList = SelectDropDownList();- private readonly IUIButton _originalTextButton = Button();- private readonly IUIDataGrid _statisticsDataGrid = DataGrid();- private readonly DisposableSemaphore _updateSemaphore = new();-- private string? _originalText;- private bool _forbidBackup;- private CancellationTokenSource? _selectionStatisticsCancellationTokenSource;- private CancellationTokenSource? _textStatisticsCancellationTokenSource;-- private int _statisticSelectionLength;- private int _statisticSelectionStartPosition;- private int _statisticSelectionEndPosition;- private int _statisticSelectionLineNumber;- private int _statisticSelectionColumnNumber;- private int _statisticByteCount;- private int _statisticCharacterCount;- private int _statisticWordCount;- private int _statisticSentenceCount;- private int _statisticParagraphCount;- private int _statisticLineCount;- private EndOfLineSequence _statisticEndOfLineSequence;- private Dictionary<char, int>? _statisticCharacterFrequency;- private Dictionary<string, int>? _statisticWordFrequency;-- [ImportingConstructor]- public AnalyzerAndUtilitiesGuiTool()- {- _textInput.SelectionChanged += OnTextInputSelectionChanged;- }-- public UIToolView View- => new(- isScrollable: false,- Grid()- .ColumnMediumSpacing()-- .Rows(- (GridRows.TopAuto, Auto),- (GridRows.Stretch, new UIGridLength(1, UIGridUnitType.Fraction)))-- .Columns(- (GridColumns.Stretch, new UIGridLength(1, UIGridUnitType.Fraction)))-- .Cells(- Cell(- GridRows.TopAuto,- GridColumns.Stretch,-- Stack()- .Vertical()- .LargeSpacing()- .WithChildren(-- // Convert line break- Stack()- .Vertical()- .SmallSpacing()- .WithChildren(-- Label()- .Text(AnalyzerAndUtilities.ConvertEndOfLineSequence),- Wrap()- .SmallSpacing()- .WithChildren(- Button().Text(AnalyzerAndUtilities.EndOfLineSequenceLF).OnClick(OnEndOfLineSequenceLFButtonClick),- Button().Text(AnalyzerAndUtilities.EndOfLineSequenceCRLF).OnClick(OnEndOfLineSequenceCRLFButtonClick))),-- // Convert case- Stack()- .Vertical()- .SmallSpacing()- .WithChildren(-- Label()- .Text(AnalyzerAndUtilities.ConvertCase),- Wrap()- .SmallSpacing()- .WithChildren(- Button().Text(AnalyzerAndUtilities.LowerCase).OnClick(OnLowerCaseButtonClick),- Button().Text(AnalyzerAndUtilities.UpperCase).OnClick(OnUpperCaseButtonClick),- Button().Text(AnalyzerAndUtilities.SentenceCase).OnClick(OnSentenceCaseButtonClick),- Button().Text(AnalyzerAndUtilities.TitleCase).OnClick(OnTitleCaseButtonClick),- Button().Text(AnalyzerAndUtilities.CamelCase).OnClick(OnCamelCaseButtonClick),- Button().Text(AnalyzerAndUtilities.PascalCase).OnClick(OnPascalCaseButtonClick),- Button().Text(AnalyzerAndUtilities.SnakeCase).OnClick(OnSnakeCaseButtonClick),- Button().Text(AnalyzerAndUtilities.ConstantCase).OnClick(OnConstantCaseButtonClick),- Button().Text(AnalyzerAndUtilities.KebabCase).OnClick(OnKebabCaseButtonClick),- Button().Text(AnalyzerAndUtilities.CobolCase).OnClick(OnCobolCaseButtonClick),- Button().Text(AnalyzerAndUtilities.TrainCase).OnClick(OnTrainCaseButtonClick),- Button().Text(AnalyzerAndUtilities.AlternatingCase).OnClick(OnAlternatingCaseButtonClick),- Button().Text(AnalyzerAndUtilities.InverseCase).OnClick(OnInverseCaseButtonClick),- Button().Text(AnalyzerAndUtilities.RandomCase).OnClick(OnRandomCaseButtonClick))),-- // Sort lines- Stack()- .Vertical()- .SmallSpacing()- .WithChildren(-- Label()- .Text(AnalyzerAndUtilities.SortLines),- Wrap()- .SmallSpacing()- .WithChildren(- Button().Text(AnalyzerAndUtilities.Alphabetize).OnClick(OnAlphabetizeButtonClick),- Button().Text(AnalyzerAndUtilities.ReverseAlphabetize).OnClick(OnReverseAlphabetizeButtonClick),- Button().Text(AnalyzerAndUtilities.AlphabetizeLast).OnClick(OnAlphabetizeLastButtonClick),- Button().Text(AnalyzerAndUtilities.ReverseAlphabetizeLast).OnClick(OnReverseAlphabetizeLastButtonClick),- Button().Text(AnalyzerAndUtilities.Reverse).OnClick(OnReverseButtonClick),- Button().Text(AnalyzerAndUtilities.Randomize).OnClick(OnRandomizeButtonClick))))),-- Cell(- GridRows.Stretch,- GridColumns.Stretch,-- SplitGrid()- .Vertical()- .RightPaneLength(new UIGridLength(250, UIGridUnitType.Pixel))-- .WithLeftPaneChild(- _textInput- .Title(AnalyzerAndUtilities.TextInput)- .CanCopyWhenEditable()- .AlwaysWrap()- .OnTextChanged(OnInputTextChanged)- .CommandBarExtraContent(- _originalTextButton- .AccentAppearance()- .Text(AnalyzerAndUtilities.ShowOriginalText)- .OnClick(OnOriginalTextButtonClick)))-- .WithRightPaneChild(- _statisticsDataGrid- .Title(AnalyzerAndUtilities.Statistics)- .ForbidSelectItem()- .Extendable()- .WithColumns(AnalyzerAndUtilities.StatisticTitle, AnalyzerAndUtilities.StatisticValue)))));-- public void Dispose()- {- _selectionStatisticsCancellationTokenSource?.Cancel();- _selectionStatisticsCancellationTokenSource?.Dispose();- _textStatisticsCancellationTokenSource?.Cancel();- _textStatisticsCancellationTokenSource?.Dispose();- _updateSemaphore.Dispose();- }-- public void OnDataReceived(string dataTypeName, object? parsedData)- {- if (dataTypeName == PredefinedCommonDataTypeNames.Text && parsedData is string text)- {- _originalText = text;- OnOriginalTextButtonClick();- }- }-- private void OnInputTextChanged(string newText)- {- if (!_forbidBackup)- {- _originalTextButton.Disable();- _originalText = newText;- }- else- {- _originalTextButton.Enable();- }-- _textStatisticsCancellationTokenSource?.Cancel();- _textStatisticsCancellationTokenSource?.Dispose();- _textStatisticsCancellationTokenSource = new CancellationTokenSource();-- ComputeTextStatisticsAsync(newText, _textStatisticsCancellationTokenSource.Token).ForgetSafely();- }-- private void OnTextInputSelectionChanged(object? sender, EventArgs e)- {- _selectionStatisticsCancellationTokenSource?.Cancel();- _selectionStatisticsCancellationTokenSource?.Dispose();- _selectionStatisticsCancellationTokenSource = new CancellationTokenSource();-- ComputeSelectionStatisticsAsync(_textInput.Text, _textInput.Selection, _selectionStatisticsCancellationTokenSource.Token).ForgetSafely();- }-- private void OnEndOfLineSequenceLFButtonClick()- {- SetTextWithoutBackup(StringHelper.ConvertLineBreakToLF(_textInput.Text));- }-- private void OnEndOfLineSequenceCRLFButtonClick()- {- SetTextWithoutBackup(StringHelper.ConvertLineBreakToCRLF(_textInput.Text));- }-- private void OnLowerCaseButtonClick()- {- SetTextWithoutBackup(_textInput.Text?.ToLowerInvariant());- }-- private void OnUpperCaseButtonClick()- {- SetTextWithoutBackup(_textInput.Text?.ToUpperInvariant());- }-- private void OnSentenceCaseButtonClick()- {- SetTextWithoutBackup(StringHelper.ConvertToSentenceCase(_textInput.Text, CancellationToken.None));- }-- private void OnTitleCaseButtonClick()- {- SetTextWithoutBackup(StringHelper.ConvertToTitleCase(_textInput.Text, CancellationToken.None));- }-- private void OnCamelCaseButtonClick()- {- SetTextWithoutBackup(StringHelper.ConvertToCamelCase(_textInput.Text, CancellationToken.None));- }-- private void OnPascalCaseButtonClick()- {- SetTextWithoutBackup(StringHelper.ConvertToPascalCase(_textInput.Text, CancellationToken.None));- }-- private void OnSnakeCaseButtonClick()- {- SetTextWithoutBackup(StringHelper.ConvertToSnakeCase(_textInput.Text, CancellationToken.None));- }-- private void OnConstantCaseButtonClick()- {- SetTextWithoutBackup(StringHelper.ConvertToConstantCase(_textInput.Text, CancellationToken.None));- }-- private void OnKebabCaseButtonClick()- {- SetTextWithoutBackup(StringHelper.ConvertToKebabCase(_textInput.Text, CancellationToken.None));- }-- private void OnCobolCaseButtonClick()- {- SetTextWithoutBackup(StringHelper.ConvertToCobolCase(_textInput.Text, CancellationToken.None));- }-- private void OnTrainCaseButtonClick()- {- SetTextWithoutBackup(StringHelper.ConvertToTrainCase(_textInput.Text, CancellationToken.None));- }-- private void OnAlternatingCaseButtonClick()- {- SetTextWithoutBackup(StringHelper.ConvertToAlternatingCase(_textInput.Text, CancellationToken.None));- }-- private void OnInverseCaseButtonClick()- {- SetTextWithoutBackup(StringHelper.ConvertToInverseCase(_textInput.Text, CancellationToken.None));- }-- private void OnRandomCaseButtonClick()- {- SetTextWithoutBackup(StringHelper.ConvertToRandomCase(_textInput.Text, CancellationToken.None));- }-- private void OnAlphabetizeButtonClick()- {- SetTextWithoutBackup(StringHelper.SortLinesAlphabetically(_textInput.Text, _statisticEndOfLineSequence));- }-- private void OnReverseAlphabetizeButtonClick()- {- SetTextWithoutBackup(StringHelper.SortLinesAlphabeticallyDescending(_textInput.Text, _statisticEndOfLineSequence));- }-- private void OnAlphabetizeLastButtonClick()- {- SetTextWithoutBackup(StringHelper.SortLinesByLastWord(_textInput.Text, _statisticEndOfLineSequence));- }-- private void OnReverseAlphabetizeLastButtonClick()- {- SetTextWithoutBackup(StringHelper.SortLinesByLastWordDescending(_textInput.Text, _statisticEndOfLineSequence));- }-- private void OnReverseButtonClick()- {- SetTextWithoutBackup(StringHelper.ReverseLines(_textInput.Text, _statisticEndOfLineSequence));- }-- private void OnRandomizeButtonClick()- {- SetTextWithoutBackup(StringHelper.ShuffleLines(_textInput.Text, _statisticEndOfLineSequence));- }-- private void OnOriginalTextButtonClick()- {- SetTextWithoutBackup(_originalText);- _originalTextButton.Disable();- }-- private void SetTextWithoutBackup(string? text)- {- _forbidBackup = true;- _textInput.Text(text ?? string.Empty);- _forbidBackup = false;- }-- private async Task ComputeTextStatisticsAsync(string text, CancellationToken cancellationToken)- {- await TaskSchedulerAwaiter.SwitchOffMainThreadAsync(cancellationToken);-- StringHelper.AnalyzeText(- text,- cancellationToken,- out int byteCount,- out int characterCount,- out int wordCount,- out int sentenceCount,- out int paragraphCount,- out int lineCount,- out EndOfLineSequence endOfLineSequence,- out Dictionary<char, int> characterFrequency,- out Dictionary<string, int> wordFrequency);-- using (await _updateSemaphore.WaitAsync(cancellationToken))- {- _statisticByteCount = byteCount;- _statisticCharacterCount = characterCount;- _statisticWordCount = wordCount;- _statisticSentenceCount = sentenceCount;- _statisticParagraphCount = paragraphCount;- _statisticLineCount = lineCount;- _statisticEndOfLineSequence = endOfLineSequence;- _statisticCharacterFrequency = characterFrequency;- _statisticWordFrequency = wordFrequency;-- DisplayStatisticsAndUpdateDetectedEndOfLineSequence();- }- }-- private async Task ComputeSelectionStatisticsAsync(string text, TextSpan selection, CancellationToken cancellationToken)- {- await TaskSchedulerAwaiter.SwitchOffMainThreadAsync(cancellationToken);-- StringHelper.AnalyzeSpan(- text,- selection,- cancellationToken,- out int spanLength,- out int spanStartPosition,- out int spanEndPosition,- out int spanLineNumber,- out int spanColumnNumber);-- using (await _updateSemaphore.WaitAsync(cancellationToken))- {- _statisticSelectionLength = spanLength;- _statisticSelectionStartPosition = spanStartPosition;- _statisticSelectionEndPosition = spanEndPosition;- _statisticSelectionLineNumber = spanLineNumber;- _statisticSelectionColumnNumber = spanColumnNumber;-- DisplayStatisticsAndUpdateDetectedEndOfLineSequence();- }- }-- private void DisplayStatisticsAndUpdateDetectedEndOfLineSequence()- {- Guard.IsTrue(_updateSemaphore.IsBusy);-- string endOfLineSequenceString- = _statisticEndOfLineSequence switch- {- EndOfLineSequence.CarriageReturn => AnalyzerAndUtilities.EndOfLineSequenceCR,- EndOfLineSequence.CarriageReturnLineFeed => AnalyzerAndUtilities.EndOfLineSequenceCRLF,- EndOfLineSequence.LineFeed => AnalyzerAndUtilities.EndOfLineSequenceLF,- EndOfLineSequence.Mixed => AnalyzerAndUtilities.EndOfLineSequenceMixed,- EndOfLineSequence.Unknown => AnalyzerAndUtilities.EndOfLineSequenceUnknown,- _ => string.Empty- };-- var rows- = new List<IUIDataGridRow>- {- CreateStatisticTitleRow(AnalyzerAndUtilities.SelectionStatistics),- Row(null, Cell(AnalyzerAndUtilities.SelectionLength), Cell(_statisticSelectionLength.ToString())),- Row(null, Cell(AnalyzerAndUtilities.SelectionStartPosition), Cell(_statisticSelectionStartPosition.ToString())),- Row(null, Cell(AnalyzerAndUtilities.SelectionEndPosition), Cell(_statisticSelectionEndPosition.ToString())),- Row(null, Cell(AnalyzerAndUtilities.SelectionLineNumber), Cell(_statisticSelectionLineNumber.ToString())),- Row(null, Cell(AnalyzerAndUtilities.SelectionColumnNumber), Cell(_statisticSelectionColumnNumber.ToString())),- CreateStatisticTitleRow(AnalyzerAndUtilities.TextStatistics),- Row(null, Cell(AnalyzerAndUtilities.Bytes), Cell(_statisticByteCount.ToString())),- Row(null, Cell(AnalyzerAndUtilities.Characters), Cell(_statisticCharacterCount.ToString())),- Row(null, Cell(AnalyzerAndUtilities.Words), Cell(_statisticWordCount.ToString())),- Row(null, Cell(AnalyzerAndUtilities.Sentences), Cell(_statisticSentenceCount.ToString())),- Row(null, Cell(AnalyzerAndUtilities.Paragraphs), Cell(_statisticParagraphCount.ToString())),- Row(null, Cell(AnalyzerAndUtilities.Lines), Cell(_statisticLineCount.ToString())),- Row(null, Cell(AnalyzerAndUtilities.EndOfLineSequence), Cell(endOfLineSequenceString))- };-- if (_statisticWordFrequency is not null)- {- if (_statisticWordFrequency.Count > 0)- {- rows.Add(CreateStatisticTitleRow(AnalyzerAndUtilities.WordFrequency));- }-- foreach (KeyValuePair<string, int> word in _statisticWordFrequency.OrderByDescending(a => a.Value))- {- rows.Add(Row(null, Cell(word.Key), Cell(word.Value.ToString())));- }- }-- if (_statisticCharacterFrequency is not null)- {- if (_statisticCharacterFrequency.Count > 0)- {- rows.Add(CreateStatisticTitleRow(AnalyzerAndUtilities.CharacterFrequency));- }-- foreach (KeyValuePair<char, int> character in _statisticCharacterFrequency.OrderByDescending(a => a.Value))- {- string displayedKey = character.Key.ToString();- if (displayedKey == " ")- {- displayedKey = "⎵";- }- else- {- displayedKey = Regex.Escape(displayedKey);- }- rows.Add(Row(null, Cell(displayedKey), Cell(character.Value.ToString())));- }- }-- _statisticsDataGrid.WithRows(rows.ToArray());-- _endOfLineSequenceDropDownList.Select((int)_statisticEndOfLineSequence);- }-- private static IUIDataGridRow CreateStatisticTitleRow(string title)- => Row(- null,- Cell(- Label()- .NeverWrap()- .Style(UILabelStyle.Subtitle)- .Text(title)),- Cell(Label()));-}diff --git a/src/app/dev/DevToys.Tools/Tools/Text/Compare/TextCompare.Designer.cs b/src/app/dev/DevToys.Tools/Tools/Text/Compare/TextCompare.Designer.csdeleted file mode 100644index 941c81aff..000000000--- a/src/app/dev/DevToys.Tools/Tools/Text/Compare/TextCompare.Designer.cs+++ /dev/null@@ -1,153 +0,0 @@-//-------------------------------------------------------------------------------// <auto-generated>-// This code was generated by a tool.-// Runtime Version:4.0.30319.42000-//-// Changes to this file may cause incorrect behavior and will be lost if-// the code is regenerated.-// </auto-generated>-//--------------------------------------------------------------------------------namespace DevToys.Tools.Tools.Text.Compare {- using System;--- /// <summary>- /// A strongly-typed resource class, for looking up localized strings, etc.- /// </summary>- // This class was auto-generated by the StronglyTypedResourceBuilder- // class via a tool like ResGen or Visual Studio.- // To add or remove a member, edit your .ResX file then rerun ResGen- // with the /str option, or rebuild your VS project.- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]- internal class TextCompare {-- private static global::System.Resources.ResourceManager resourceMan;-- private static global::System.Globalization.CultureInfo resourceCulture;-- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]- internal TextCompare() {- }-- /// <summary>- /// Returns the cached ResourceManager instance used by this class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Resources.ResourceManager ResourceManager {- get {- if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Tools.Tools.Text.Compare.TextCompare", typeof(TextCompare).Assembly);- resourceMan = temp;- }- return resourceMan;- }- }-- /// <summary>- /// Overrides the current thread's CurrentUICulture property for all- /// resource lookups using this strongly typed resource class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Globalization.CultureInfo Culture {- get {- return resourceCulture;- }- set {- resourceCulture = value;- }- }-- /// <summary>- /// Looks up a localized string similar to Text comparer tool.- /// </summary>- internal static string AccessibleName {- get {- return ResourceManager.GetString("AccessibleName", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Configuration.- /// </summary>- internal static string Configuration {- get {- return ResourceManager.GetString("Configuration", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Compare two texts.- /// </summary>- internal static string Description {- get {- return ResourceManager.GetString("Description", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Difference.- /// </summary>- internal static string Difference {- get {- return ResourceManager.GetString("Difference", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Inline mode.- /// </summary>- internal static string InlineDifference {- get {- return ResourceManager.GetString("InlineDifference", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Text Comparer.- /// </summary>- internal static string LongDisplayTitle {- get {- return ResourceManager.GetString("LongDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Modified text.- /// </summary>- internal static string ModifiedText {- get {- return ResourceManager.GetString("ModifiedText", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Original text.- /// </summary>- internal static string OriginalText {- get {- return ResourceManager.GetString("OriginalText", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Diff.- /// </summary>- internal static string SearchKeywords {- get {- return ResourceManager.GetString("SearchKeywords", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Compare.- /// </summary>- internal static string ShortDisplayTitle {- get {- return ResourceManager.GetString("ShortDisplayTitle", resourceCulture);- }- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Text/Compare/TextCompare.resx b/src/app/dev/DevToys.Tools/Tools/Text/Compare/TextCompare.resxdeleted file mode 100644index 628c0e0dd..000000000--- a/src/app/dev/DevToys.Tools/Tools/Text/Compare/TextCompare.resx+++ /dev/null@@ -1,150 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<root>- <!--- Microsoft ResX Schema-- Version 2.0-- The primary goals of this format is to allow a simple XML format- that is mostly human readable. The generation and parsing of the- various data types are done through the TypeConverter classes- associated with the data types.-- Example:-- ... ado.net/XML headers & schema ...- <resheader name="resmimetype">text/microsoft-resx</resheader>- <resheader name="version">2.0</resheader>- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">- <value>[base64 mime encoded serialized .NET Framework object]</value>- </data>- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>- <comment>This is a comment</comment>- </data>-- There are any number of "resheader" rows that contain simple- name/value pairs.-- Each data row contains a name, and value. The row also contains a- type or mimetype. Type corresponds to a .NET class that support- text/value conversion through the TypeConverter architecture.- Classes that don't support this are serialized and stored with the- mimetype set.-- The mimetype is used for serialized objects, and tells the- ResXResourceReader how to depersist the object. This is currently not- extensible. For a given mimetype the value must be set accordingly:-- Note - application/x-microsoft.net.object.binary.base64 is the format- that the ResXResourceWriter will generate, however the reader can- read any of the formats listed below.-- mimetype: application/x-microsoft.net.object.binary.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.soap.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.bytearray.base64- value : The object must be serialized into a byte array- : using a System.ComponentModel.TypeConverter- : and then encoded with base64 encoding.- -->- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />- <xsd:element name="root" msdata:IsDataSet="true">- <xsd:complexType>- <xsd:choice maxOccurs="unbounded">- <xsd:element name="metadata">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" />- </xsd:sequence>- <xsd:attribute name="name" use="required" type="xsd:string" />- <xsd:attribute name="type" type="xsd:string" />- <xsd:attribute name="mimetype" type="xsd:string" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="assembly">- <xsd:complexType>- <xsd:attribute name="alias" type="xsd:string" />- <xsd:attribute name="name" type="xsd:string" />- </xsd:complexType>- </xsd:element>- <xsd:element name="data">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="resheader">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" />- </xsd:complexType>- </xsd:element>- </xsd:choice>- </xsd:complexType>- </xsd:element>- </xsd:schema>- <resheader name="resmimetype">- <value>text/microsoft-resx</value>- </resheader>- <resheader name="version">- <value>2.0</value>- </resheader>- <resheader name="reader">- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <resheader name="writer">- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <data name="AccessibleName" xml:space="preserve">- <value>Text comparer tool</value>- </data>- <data name="Configuration" xml:space="preserve">- <value>Configuration</value>- </data>- <data name="Description" xml:space="preserve">- <value>Compare two texts</value>- </data>- <data name="Difference" xml:space="preserve">- <value>Difference</value>- </data>- <data name="InlineDifference" xml:space="preserve">- <value>Inline mode</value>- </data>- <data name="LongDisplayTitle" xml:space="preserve">- <value>Text Comparer</value>- </data>- <data name="ModifiedText" xml:space="preserve">- <value>Modified text</value>- </data>- <data name="OriginalText" xml:space="preserve">- <value>Original text</value>- </data>- <data name="SearchKeywords" xml:space="preserve">- <value>Diff</value>- </data>- <data name="ShortDisplayTitle" xml:space="preserve">- <value>Compare</value>- </data>-</root>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/Text/Compare/TextCompareGuiTool.cs b/src/app/dev/DevToys.Tools/Tools/Text/Compare/TextCompareGuiTool.csdeleted file mode 100644index cc961880e..000000000--- a/src/app/dev/DevToys.Tools/Tools/Text/Compare/TextCompareGuiTool.cs+++ /dev/null@@ -1,147 +0,0 @@-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.Tools.Text.Compare;--[Export(typeof(IGuiTool))]-[Name("TextCompare")]-[ToolDisplayInformation(- IconFontName = "DevToys-Tools-Icons",- IconGlyph = '\u0115',- GroupName = PredefinedCommonToolGroupNames.Text,- ResourceManagerAssemblyIdentifier = nameof(DevToysToolsResourceManagerAssemblyIdentifier),- ResourceManagerBaseName = "DevToys.Tools.Tools.Text.Compare.TextCompare",- ShortDisplayTitleResourceName = nameof(TextCompare.ShortDisplayTitle),- LongDisplayTitleResourceName = nameof(TextCompare.LongDisplayTitle),- DescriptionResourceName = nameof(TextCompare.Description),- SearchKeywordsResourceName = nameof(TextCompare.SearchKeywords),- AccessibleNameResourceName = nameof(TextCompare.AccessibleName))]-internal sealed class TextCompareGuiTool : IGuiTool-{- /// <summary>- /// Whether the text comparison should be inline or split,- /// </summary>- private static readonly SettingDefinition<bool> inline- = new(- name: $"{nameof(TextCompareGuiTool)}.{nameof(inline)}",- defaultValue: false);-- private enum GridRows- {- Configuration,- Text,- }-- private enum GridColumns- {- Stretch- }-- private readonly ILogger _logger;- private readonly ISettingsProvider _settingsProvider;- private readonly IUIDiffTextInput _diffTextInput = DiffTextInput("text-compare-diff-text-input");-- [ImportingConstructor]- public TextCompareGuiTool(ISettingsProvider settingsProvider)- {- _logger = this.Log();- _settingsProvider = settingsProvider;-- if (_settingsProvider.GetSetting(inline))- {- _diffTextInput.InlineView();- }- else- {- _diffTextInput.SplitView();- }- }-- public UIToolView View- => new(- isScrollable: true,- Grid()- .ColumnMediumSpacing()-- .Rows(- (GridRows.Configuration, Auto),- (GridRows.Text, new UIGridLength(1, UIGridUnitType.Fraction)))-- .Columns(- (GridColumns.Stretch, new UIGridLength(1, UIGridUnitType.Fraction)))-- .Cells(- Cell(- GridRows.Configuration,- GridColumns.Stretch,-- Stack()- .Vertical()-- .WithChildren(- Label()- .Text(TextCompare.Configuration),-- Setting("text-compare-inline-setting")- .Icon("FluentSystemIcons", '\uEB59')- .Title(TextCompare.InlineDifference)- .Handle(_settingsProvider, inline, OnInlineChanged))),-- Cell(- GridRows.Text,- GridColumns.Stretch,-- SplitGrid()- .Horizontal()- .TopPaneLength(new UIGridLength(1, UIGridUnitType.Fraction))- .BottomPaneLength(new UIGridLength(2, UIGridUnitType.Fraction))-- .WithTopPaneChild(- SplitGrid()- .Vertical()-- .WithLeftPaneChild(- MultilineTextInput()- .Title(TextCompare.OriginalText)- .OnTextChanged(OnOriginalTextChanged))-- .WithRightPaneChild(- MultilineTextInput()- .Title(TextCompare.ModifiedText)- .OnTextChanged(OnModifiedTextChanged)))-- .WithBottomPaneChild(- _diffTextInput- .Title(TextCompare.Difference)- .ReadOnly()- .Extendable()))));-- public void OnDataReceived(string dataTypeName, object? parsedData)- {- }-- private ValueTask OnInlineChanged(bool inline)- {- if (inline)- {- _diffTextInput.InlineView();- }- else- {- _diffTextInput.SplitView();- }-- return ValueTask.CompletedTask;- }-- private ValueTask OnOriginalTextChanged(string originalText)- {- _diffTextInput.OriginalText(originalText);- return ValueTask.CompletedTask;- }-- private ValueTask OnModifiedTextChanged(string modifiedText)- {- _diffTextInput.ModifiedText(modifiedText);- return ValueTask.CompletedTask;- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Text/EscapeUnescape/EscapeUnescape.Designer.cs b/src/app/dev/DevToys.Tools/Tools/Text/EscapeUnescape/EscapeUnescape.Designer.csdeleted file mode 100644index 017dcd4a9..000000000--- a/src/app/dev/DevToys.Tools/Tools/Text/EscapeUnescape/EscapeUnescape.Designer.cs+++ /dev/null@@ -1,207 +0,0 @@-//-------------------------------------------------------------------------------// <auto-generated>-// This code was generated by a tool.-// Runtime Version:4.0.30319.42000-//-// Changes to this file may cause incorrect behavior and will be lost if-// the code is regenerated.-// </auto-generated>-//--------------------------------------------------------------------------------namespace DevToys.Tools.Tools.Text.EscapeUnescape {- using System;--- /// <summary>- /// A strongly-typed resource class, for looking up localized strings, etc.- /// </summary>- // This class was auto-generated by the StronglyTypedResourceBuilder- // class via a tool like ResGen or Visual Studio.- // To add or remove a member, edit your .ResX file then rerun ResGen- // with the /str option, or rebuild your VS project.- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]- internal class EscapeUnescape {-- private static global::System.Resources.ResourceManager resourceMan;-- private static global::System.Globalization.CultureInfo resourceCulture;-- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]- internal EscapeUnescape() {- }-- /// <summary>- /// Returns the cached ResourceManager instance used by this class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Resources.ResourceManager ResourceManager {- get {- if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Tools.Tools.Text.EscapeUnescape.EscapeUnescape", typeof(EscapeUnescape).Assembly);- resourceMan = temp;- }- return resourceMan;- }- }-- /// <summary>- /// Overrides the current thread's CurrentUICulture property for all- /// resource lookups using this strongly typed resource class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Globalization.CultureInfo Culture {- get {- return resourceCulture;- }- set {- resourceCulture = value;- }- }-- /// <summary>- /// Looks up a localized string similar to Text Escape and Unescape tool.- /// </summary>- internal static string AccessibleName {- get {- return ResourceManager.GetString("AccessibleName", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Configuration.- /// </summary>- internal static string ConfigurationTitle {- get {- return ResourceManager.GetString("ConfigurationTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Unescape.- /// </summary>- internal static string ConversionDecode {- get {- return ResourceManager.GetString("ConversionDecode", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Select which conversion mode you want to use.- /// </summary>- internal static string ConversionDescription {- get {- return ResourceManager.GetString("ConversionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Escape.- /// </summary>- internal static string ConversionEncode {- get {- return ResourceManager.GetString("ConversionEncode", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Whether to escape or unescape the input text.- /// </summary>- internal static string ConversionOptionDescription {- get {- return ResourceManager.GetString("ConversionOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Conversion.- /// </summary>- internal static string ConversionTitle {- get {- return ResourceManager.GetString("ConversionTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Escapes or unescapes a string, removing characters that could prevent parsing..- /// </summary>- internal static string Description {- get {- return ResourceManager.GetString("Description", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Input file selected doesn't exist.- /// </summary>- internal static string InputFileNotFound {- get {- return ResourceManager.GetString("InputFileNotFound", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Text or path to a file to convert to escaped or unescaped text.- /// </summary>- internal static string InputOptionDescription {- get {- return ResourceManager.GetString("InputOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Input.- /// </summary>- internal static string InputTitle {- get {- return ResourceManager.GetString("InputTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Please specify an input text or an input file.- /// </summary>- internal static string InvalidInputOrFileCommand {- get {- return ResourceManager.GetString("InvalidInputOrFileCommand", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Text Escape / Unescape.- /// </summary>- internal static string LongDisplayTitle {- get {- return ResourceManager.GetString("LongDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Path to the output file.- /// </summary>- internal static string OutputFileOptionDescription {- get {- return ResourceManager.GetString("OutputFileOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Output.- /// </summary>- internal static string OutputTitle {- get {- return ResourceManager.GetString("OutputTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Escape / Unescape.- /// </summary>- internal static string ShortDisplayTitle {- get {- return ResourceManager.GetString("ShortDisplayTitle", resourceCulture);- }- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Text/EscapeUnescape/EscapeUnescape.resx b/src/app/dev/DevToys.Tools/Tools/Text/EscapeUnescape/EscapeUnescape.resxdeleted file mode 100644index 75131928e..000000000--- a/src/app/dev/DevToys.Tools/Tools/Text/EscapeUnescape/EscapeUnescape.resx+++ /dev/null@@ -1,168 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<root>- <!--- Microsoft ResX Schema-- Version 2.0-- The primary goals of this format is to allow a simple XML format- that is mostly human readable. The generation and parsing of the- various data types are done through the TypeConverter classes- associated with the data types.-- Example:-- ... ado.net/XML headers & schema ...- <resheader name="resmimetype">text/microsoft-resx</resheader>- <resheader name="version">2.0</resheader>- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">- <value>[base64 mime encoded serialized .NET Framework object]</value>- </data>- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>- <comment>This is a comment</comment>- </data>-- There are any number of "resheader" rows that contain simple- name/value pairs.-- Each data row contains a name, and value. The row also contains a- type or mimetype. Type corresponds to a .NET class that support- text/value conversion through the TypeConverter architecture.- Classes that don't support this are serialized and stored with the- mimetype set.-- The mimetype is used for serialized objects, and tells the- ResXResourceReader how to depersist the object. This is currently not- extensible. For a given mimetype the value must be set accordingly:-- Note - application/x-microsoft.net.object.binary.base64 is the format- that the ResXResourceWriter will generate, however the reader can- read any of the formats listed below.-- mimetype: application/x-microsoft.net.object.binary.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.soap.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.bytearray.base64- value : The object must be serialized into a byte array- : using a System.ComponentModel.TypeConverter- : and then encoded with base64 encoding.- -->- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />- <xsd:element name="root" msdata:IsDataSet="true">- <xsd:complexType>- <xsd:choice maxOccurs="unbounded">- <xsd:element name="metadata">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" />- </xsd:sequence>- <xsd:attribute name="name" use="required" type="xsd:string" />- <xsd:attribute name="type" type="xsd:string" />- <xsd:attribute name="mimetype" type="xsd:string" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="assembly">- <xsd:complexType>- <xsd:attribute name="alias" type="xsd:string" />- <xsd:attribute name="name" type="xsd:string" />- </xsd:complexType>- </xsd:element>- <xsd:element name="data">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="resheader">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" />- </xsd:complexType>- </xsd:element>- </xsd:choice>- </xsd:complexType>- </xsd:element>- </xsd:schema>- <resheader name="resmimetype">- <value>text/microsoft-resx</value>- </resheader>- <resheader name="version">- <value>2.0</value>- </resheader>- <resheader name="reader">- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <resheader name="writer">- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <data name="AccessibleName" xml:space="preserve">- <value>Text Escape and Unescape tool</value>- </data>- <data name="ConfigurationTitle" xml:space="preserve">- <value>Configuration</value>- </data>- <data name="ConversionDecode" xml:space="preserve">- <value>Unescape</value>- </data>- <data name="ConversionDescription" xml:space="preserve">- <value>Select which conversion mode you want to use</value>- </data>- <data name="ConversionEncode" xml:space="preserve">- <value>Escape</value>- </data>- <data name="ConversionOptionDescription" xml:space="preserve">- <value>Whether to escape or unescape the input text</value>- </data>- <data name="ConversionTitle" xml:space="preserve">- <value>Conversion</value>- </data>- <data name="Description" xml:space="preserve">- <value>Escapes or unescapes a string, removing characters that could prevent parsing.</value>- </data>- <data name="InputFileNotFound" xml:space="preserve">- <value>Input file selected doesn't exist</value>- </data>- <data name="InputOptionDescription" xml:space="preserve">- <value>Text or path to a file to convert to escaped or unescaped text</value>- </data>- <data name="InputTitle" xml:space="preserve">- <value>Input</value>- </data>- <data name="InvalidInputOrFileCommand" xml:space="preserve">- <value>Please specify an input text or an input file</value>- </data>- <data name="LongDisplayTitle" xml:space="preserve">- <value>Text Escape / Unescape</value>- </data>- <data name="OutputFileOptionDescription" xml:space="preserve">- <value>Path to the output file</value>- </data>- <data name="OutputTitle" xml:space="preserve">- <value>Output</value>- </data>- <data name="ShortDisplayTitle" xml:space="preserve">- <value>Escape / Unescape</value>- </data>-</root>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/Text/EscapeUnescape/EscapeUnescapeCommandLineTool.cs b/src/app/dev/DevToys.Tools/Tools/Text/EscapeUnescape/EscapeUnescapeCommandLineTool.csdeleted file mode 100644index 622bc0094..000000000--- a/src/app/dev/DevToys.Tools/Tools/Text/EscapeUnescape/EscapeUnescapeCommandLineTool.cs+++ /dev/null@@ -1,78 +0,0 @@-using DevToys.Tools.Helpers;-using DevToys.Tools.Models;-using Microsoft.Extensions.Logging;-using OneOf;--namespace DevToys.Tools.Tools.Text.EscapeUnescape;--[Export(typeof(ICommandLineTool))]-[Name("EscapeUnescape")]-[CommandName(- Name = "escape",- Alias = "esc",- ResourceManagerBaseName = "DevToys.Tools.Tools.Text.EscapeUnescape.EscapeUnescape",- DescriptionResourceName = nameof(EscapeUnescape.Description))]-internal sealed class EscapeUnescapeCommandLineTool : ICommandLineTool-{-#pragma warning disable IDE0044 // Add readonly modifier- [Import]- private IFileStorage _fileStorage = null!;-#pragma warning restore IDE0044 // Add readonly modifier-- [CommandLineOption(- Name = "input",- Alias = "i",- IsRequired = true,- DescriptionResourceName = nameof(EscapeUnescape.InputOptionDescription))]- private OneOf<FileInfo, string>? Input { get; set; }-- [CommandLineOption(- Name = "outputFile",- Alias = "o",- DescriptionResourceName = nameof(EscapeUnescape.OutputFileOptionDescription))]- internal FileInfo? OutputFile { get; set; }-- [CommandLineOption(- Name = "conversion",- Alias = "c",- DescriptionResourceName = nameof(EscapeUnescape.ConversionOptionDescription))]- private EncodingConversion EncodingConversionMode { get; set; } = EncodingConversion.Encode;-- public async ValueTask<int> InvokeAsync(ILogger logger, CancellationToken cancellationToken)- {- ResultInfo<string> result;- if (!Input.HasValue)- {- Console.Error.WriteLine(EscapeUnescape.InvalidInputOrFileCommand);- return -1;- }-- result = await Input.Value.ReadAllTextAsync(_fileStorage, cancellationToken);- if (!result.HasSucceeded)- {- Console.Error.WriteLine(EscapeUnescape.InputFileNotFound);- return -1;- }-- Guard.IsNotNull(result.Data);- ResultInfo<string> output = EncodingConversionMode switch- {- EncodingConversion.Encode => StringHelper.EscapeString(result.Data, logger, cancellationToken),- EncodingConversion.Decode => StringHelper.UnescapeString(result.Data, logger, cancellationToken),- _ => throw new NotSupportedException(),- };-- cancellationToken.ThrowIfCancellationRequested();-- if (output.HasSucceeded)- {- await FileHelper.WriteOutputAsync(output.Data, OutputFile, cancellationToken);- return 0;- }- else- {- Console.Error.WriteLine(output.Data);- return -1;- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Text/EscapeUnescape/EscapeUnescapeGuiTool.cs b/src/app/dev/DevToys.Tools/Tools/Text/EscapeUnescape/EscapeUnescapeGuiTool.csdeleted file mode 100644index abbcdb60f..000000000--- a/src/app/dev/DevToys.Tools/Tools/Text/EscapeUnescape/EscapeUnescapeGuiTool.cs+++ /dev/null@@ -1,186 +0,0 @@-using DevToys.Tools.Helpers;-using DevToys.Tools.Models;-using DevToys.Tools.SmartDetection;-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.Tools.Text.EscapeUnescape;--[Export(typeof(IGuiTool))]-[Name("EscapeUnescape")]-[ToolDisplayInformation(- IconFontName = "DevToys-Tools-Icons",- IconGlyph = '\u0130',- GroupName = PredefinedCommonToolGroupNames.Text,- ResourceManagerAssemblyIdentifier = nameof(DevToysToolsResourceManagerAssemblyIdentifier),- ResourceManagerBaseName = "DevToys.Tools.Tools.Text.EscapeUnescape.EscapeUnescape",- ShortDisplayTitleResourceName = nameof(EscapeUnescape.ShortDisplayTitle),- LongDisplayTitleResourceName = nameof(EscapeUnescape.LongDisplayTitle),- DescriptionResourceName = nameof(EscapeUnescape.Description),- AccessibleNameResourceName = nameof(EscapeUnescape.AccessibleName))]-[AcceptedDataTypeName(EscapedCharactersDetector.InternalName)]-internal sealed class EscapeUnescapeGuiTool : IGuiTool, IDisposable-{- /// <summary>- /// Whether the tool should escape or unescape the text.- /// </summary>- private static readonly SettingDefinition<EncodingConversion> conversionMode- = new(- name: $"{nameof(EscapeUnescapeGuiTool)}.{nameof(conversionMode)}",- defaultValue: EncodingConversion.Encode);- private enum GridRows- {- Settings,- Input,- Output- }-- private enum GridColumns- {- Stretch- }-- private readonly DisposableSemaphore _semaphore = new();- private readonly ILogger _logger;- private readonly ISettingsProvider _settingsProvider;- private readonly IUISwitch _conversionModeSwitch = Switch("text-escape-unescape-conversion-mode-switch");- private readonly IUIMultiLineTextInput _inputText = MultilineTextInput("text-escape-unescape-input-box");- private readonly IUIMultiLineTextInput _outputText = MultilineTextInput("text-escape-unescape-output-box");-- private CancellationTokenSource? _cancellationTokenSource;-- [ImportingConstructor]- public EscapeUnescapeGuiTool(ISettingsProvider settingsProvider)- {- _logger = this.Log();- _settingsProvider = settingsProvider;-- if (_settingsProvider.GetSetting(conversionMode) == EncodingConversion.Encode)- {- _conversionModeSwitch.On();- }- }-- // For unit tests.- internal Task? WorkTask { get; private set; }-- public UIToolView View- => new(- isScrollable: true,- Grid()- .RowLargeSpacing()-- .Rows(- (GridRows.Settings, Auto),- (GridRows.Input, new UIGridLength(1, UIGridUnitType.Fraction)),- (GridRows.Output, new UIGridLength(1, UIGridUnitType.Fraction)))-- .Columns(- (GridColumns.Stretch, new UIGridLength(1, UIGridUnitType.Fraction)))-- .Cells(- Cell(- GridRows.Settings,- GridColumns.Stretch,-- Stack()- .Vertical()- .SmallSpacing()-- .WithChildren(- Label()- .Text(EscapeUnescape.ConfigurationTitle),-- Setting("text-escape-unescape-conversion-mode-setting")- .Icon("FluentSystemIcons", '\uF18D')- .Title(EscapeUnescape.ConversionTitle)- .Description(EscapeUnescape.ConversionDescription)-- .InteractiveElement(- _conversionModeSwitch- .OnText(EscapeUnescape.ConversionEncode)- .OffText(EscapeUnescape.ConversionDecode)- .OnToggle(OnConversionModeChanged)))),-- Cell(- GridRows.Input,- GridColumns.Stretch,-- _inputText- .Title(EscapeUnescape.InputTitle)- .OnTextChanged(OnInputTextChanged)),-- Cell(- GridRows.Output,- GridColumns.Stretch,-- _outputText- .Title(EscapeUnescape.OutputTitle)- .ReadOnly()- .Extendable())));-- public void OnDataReceived(string dataTypeName, object? parsedData)- {- if (dataTypeName == EscapedCharactersDetector.InternalName && parsedData is string text)- {- _conversionModeSwitch.Off(); // Switch to Unescape mode- _inputText.Text(text); // This will trigger a conversion.- }- }-- public void Dispose()- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _semaphore.Dispose();- }-- private void OnConversionModeChanged(bool conversionMode)- {- _settingsProvider.SetSetting(- EscapeUnescapeGuiTool.conversionMode,- conversionMode ? EncodingConversion.Encode : EncodingConversion.Decode);- _inputText.Text(_outputText.Text); // This will trigger a conversion.- }-- private void OnInputTextChanged(string text)- {- StartConvert(text);- }-- private void StartConvert(string text)- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _cancellationTokenSource = new CancellationTokenSource();-- WorkTask = ConvertAsync(text, _settingsProvider.GetSetting(conversionMode), _cancellationTokenSource.Token);- }-- private async Task ConvertAsync(string input, EncodingConversion conversionMode, CancellationToken cancellationToken)- {- using (await _semaphore.WaitAsync(cancellationToken))- {- await TaskSchedulerAwaiter.SwitchOffMainThreadAsync(cancellationToken);-- ResultInfo<string> conversionResult = conversionMode switch- {- EncodingConversion.Encode- => StringHelper.EscapeString(- input,- _logger,- cancellationToken),-- EncodingConversion.Decode- => StringHelper.UnescapeString(- input,- _logger,- cancellationToken),-- _ => throw new NotSupportedException(),- };-- cancellationToken.ThrowIfCancellationRequested();- _outputText.Text(conversionResult.Data!);- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Text/ListCompare/ListCompare.Designer.cs b/src/app/dev/DevToys.Tools/Tools/Text/ListCompare/ListCompare.Designer.csdeleted file mode 100644index d66810d08..000000000--- a/src/app/dev/DevToys.Tools/Tools/Text/ListCompare/ListCompare.Designer.cs+++ /dev/null@@ -1,225 +0,0 @@-//-------------------------------------------------------------------------------// <auto-generated>-// This code was generated by a tool.-// Runtime Version:4.0.30319.42000-//-// Changes to this file may cause incorrect behavior and will be lost if-// the code is regenerated.-// </auto-generated>-//--------------------------------------------------------------------------------namespace DevToys.Tools.Tools.Text.ListCompare {- using System;--- /// <summary>- /// A strongly-typed resource class, for looking up localized strings, etc.- /// </summary>- // This class was auto-generated by the StronglyTypedResourceBuilder- // class via a tool like ResGen or Visual Studio.- // To add or remove a member, edit your .ResX file then rerun ResGen- // with the /str option, or rebuild your VS project.- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]- internal class ListCompare {-- private static global::System.Resources.ResourceManager resourceMan;-- private static global::System.Globalization.CultureInfo resourceCulture;-- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]- internal ListCompare() {- }-- /// <summary>- /// Returns the cached ResourceManager instance used by this class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Resources.ResourceManager ResourceManager {- get {- if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Tools.Tools.Text.ListCompare.ListCompare", typeof(ListCompare).Assembly);- resourceMan = temp;- }- return resourceMan;- }- }-- /// <summary>- /// Overrides the current thread's CurrentUICulture property for all- /// resource lookups using this strongly typed resource class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Globalization.CultureInfo Culture {- get {- return resourceCulture;- }- set {- resourceCulture = value;- }- }-- /// <summary>- /// Looks up a localized string similar to List comparer tool.- /// </summary>- internal static string AccessibleName {- get {- return ResourceManager.GetString("AccessibleName", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to A ∩ B.- /// </summary>- internal static string AInterB {- get {- return ResourceManager.GetString("AInterB", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to A Only.- /// </summary>- internal static string AOnly {- get {- return ResourceManager.GetString("AOnly", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to A ∪ B.- /// </summary>- internal static string AUnionB {- get {- return ResourceManager.GetString("AUnionB", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to B Only.- /// </summary>- internal static string BOnly {- get {- return ResourceManager.GetString("BOnly", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Please specify comparison mode (A ∩ B, A ∪ B, A Only, B Only).- /// </summary>- internal static string ComparisonOptionDescription {- get {- return ResourceManager.GetString("ComparisonOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Comparison mode.- /// </summary>- internal static string ComparisonOptionTitle {- get {- return ResourceManager.GetString("ComparisonOptionTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Configuration.- /// </summary>- internal static string Configuration {- get {- return ResourceManager.GetString("Configuration", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Compare two lists.- /// </summary>- internal static string Description {- get {- return ResourceManager.GetString("Description", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Input file selected doesn't exist.- /// </summary>- internal static string InputFileNotFound {- get {- return ResourceManager.GetString("InputFileNotFound", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to A.- /// </summary>- internal static string ListA {- get {- return ResourceManager.GetString("ListA", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to B.- /// </summary>- internal static string ListB {- get {- return ResourceManager.GetString("ListB", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to List Comparer.- /// </summary>- internal static string LongDisplayTitle {- get {- return ResourceManager.GetString("LongDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Path to a file to get compared list (display if empty).- /// </summary>- internal static string OutputFileOptionDescription {- get {- return ResourceManager.GetString("OutputFileOptionDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Path of the first list to compare.- /// </summary>- internal static string PathListA {- get {- return ResourceManager.GetString("PathListA", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Path of the second list to compare.- /// </summary>- internal static string PathListB {- get {- return ResourceManager.GetString("PathListB", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to List Compare.- /// </summary>- internal static string ShortDisplayTitle {- get {- return ResourceManager.GetString("ShortDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Case sensitive comparison.- /// </summary>- internal static string TextCaseSensitiveComparison {- get {- return ResourceManager.GetString("TextCaseSensitiveComparison", resourceCulture);- }- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Text/ListCompare/ListCompare.resx b/src/app/dev/DevToys.Tools/Tools/Text/ListCompare/ListCompare.resxdeleted file mode 100644index a1cfdac76..000000000--- a/src/app/dev/DevToys.Tools/Tools/Text/ListCompare/ListCompare.resx+++ /dev/null@@ -1,174 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<root>- <!--- Microsoft ResX Schema-- Version 2.0-- The primary goals of this format is to allow a simple XML format- that is mostly human readable. The generation and parsing of the- various data types are done through the TypeConverter classes- associated with the data types.-- Example:-- ... ado.net/XML headers & schema ...- <resheader name="resmimetype">text/microsoft-resx</resheader>- <resheader name="version">2.0</resheader>- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">- <value>[base64 mime encoded serialized .NET Framework object]</value>- </data>- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>- <comment>This is a comment</comment>- </data>-- There are any number of "resheader" rows that contain simple- name/value pairs.-- Each data row contains a name, and value. The row also contains a- type or mimetype. Type corresponds to a .NET class that support- text/value conversion through the TypeConverter architecture.- Classes that don't support this are serialized and stored with the- mimetype set.-- The mimetype is used for serialized objects, and tells the- ResXResourceReader how to depersist the object. This is currently not- extensible. For a given mimetype the value must be set accordingly:-- Note - application/x-microsoft.net.object.binary.base64 is the format- that the ResXResourceWriter will generate, however the reader can- read any of the formats listed below.-- mimetype: application/x-microsoft.net.object.binary.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.soap.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.bytearray.base64- value : The object must be serialized into a byte array- : using a System.ComponentModel.TypeConverter- : and then encoded with base64 encoding.- -->- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />- <xsd:element name="root" msdata:IsDataSet="true">- <xsd:complexType>- <xsd:choice maxOccurs="unbounded">- <xsd:element name="metadata">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" />- </xsd:sequence>- <xsd:attribute name="name" use="required" type="xsd:string" />- <xsd:attribute name="type" type="xsd:string" />- <xsd:attribute name="mimetype" type="xsd:string" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="assembly">- <xsd:complexType>- <xsd:attribute name="alias" type="xsd:string" />- <xsd:attribute name="name" type="xsd:string" />- </xsd:complexType>- </xsd:element>- <xsd:element name="data">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="resheader">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" />- </xsd:complexType>- </xsd:element>- </xsd:choice>- </xsd:complexType>- </xsd:element>- </xsd:schema>- <resheader name="resmimetype">- <value>text/microsoft-resx</value>- </resheader>- <resheader name="version">- <value>2.0</value>- </resheader>- <resheader name="reader">- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <resheader name="writer">- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <data name="AccessibleName" xml:space="preserve">- <value>List comparer tool</value>- </data>- <data name="AInterB" xml:space="preserve">- <value>A ∩ B</value>- </data>- <data name="AOnly" xml:space="preserve">- <value>A Only</value>- </data>- <data name="AUnionB" xml:space="preserve">- <value>A ∪ B</value>- </data>- <data name="BOnly" xml:space="preserve">- <value>B Only</value>- </data>- <data name="ComparisonOptionDescription" xml:space="preserve">- <value>Please specify comparison mode (A ∩ B, A ∪ B, A Only, B Only)</value>- </data>- <data name="ComparisonOptionTitle" xml:space="preserve">- <value>Comparison mode</value>- </data>- <data name="Configuration" xml:space="preserve">- <value>Configuration</value>- </data>- <data name="Description" xml:space="preserve">- <value>Compare two lists</value>- </data>- <data name="InputFileNotFound" xml:space="preserve">- <value>Input file selected doesn't exist</value>- </data>- <data name="ListA" xml:space="preserve">- <value>A</value>- </data>- <data name="ListB" xml:space="preserve">- <value>B</value>- </data>- <data name="LongDisplayTitle" xml:space="preserve">- <value>List Comparer</value>- </data>- <data name="OutputFileOptionDescription" xml:space="preserve">- <value>Path to a file to get compared list (display if empty)</value>- </data>- <data name="PathListA" xml:space="preserve">- <value>Path of the first list to compare</value>- </data>- <data name="PathListB" xml:space="preserve">- <value>Path of the second list to compare</value>- </data>- <data name="ShortDisplayTitle" xml:space="preserve">- <value>List Compare</value>- </data>- <data name="TextCaseSensitiveComparison" xml:space="preserve">- <value>Case sensitive comparison</value>- </data>-</root>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/Text/ListCompare/ListCompareCommandLineTool.cs b/src/app/dev/DevToys.Tools/Tools/Text/ListCompare/ListCompareCommandLineTool.csdeleted file mode 100644index 635d5faa3..000000000--- a/src/app/dev/DevToys.Tools/Tools/Text/ListCompare/ListCompareCommandLineTool.cs+++ /dev/null@@ -1,89 +0,0 @@-using DevToys.Tools.Helpers;-using DevToys.Tools.Models;-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.Tools.Text.ListCompare;--[Export(typeof(ICommandLineTool))]-[Name("ListCompare")]-[CommandName(- Name = "listcompare",- Alias = "lc",- ResourceManagerBaseName = "DevToys.Tools.Tools.Text.ListCompare.ListCompare",- DescriptionResourceName = nameof(ListCompare.Description))]-internal sealed class ListCompareCommandLineTool : ICommandLineTool-{-#pragma warning disable IDE0044 // Add readonly modifier- [Import]- private IFileStorage _fileStorage = null!;-#pragma warning restore IDE0044 // Add readonly modifier-- [CommandLineOption(- Name = "filea",- Alias = "a",- IsRequired = true,- DescriptionResourceName = nameof(ListCompare.PathListA))]- private FileInfo? FileA { get; set; }-- [CommandLineOption(- Name = "fileb",- Alias = "b",- IsRequired = true,- DescriptionResourceName = nameof(ListCompare.PathListB))]- private FileInfo? FileB { get; set; }-- [CommandLineOption(- Name = "outputFile",- Alias = "o",- DescriptionResourceName = nameof(ListCompare.OutputFileOptionDescription))]- internal FileInfo? OutputFile { get; set; }-- [CommandLineOption(- Name = "casesensitive",- Alias = "cs",- DescriptionResourceName = nameof(ListCompare.TextCaseSensitiveComparison))]- private bool IsCaseSensitive { get; set; }-- [CommandLineOption(- Name = "comparisonmode",- Alias = "cm",- DescriptionResourceName = nameof(ListCompare.ComparisonOptionDescription))]- private ListComparisonMode ComparisonMode { get; set; }-- public async ValueTask<int> InvokeAsync(ILogger logger, CancellationToken cancellationToken)- {- if (FileA == null || !FileA.Exists)- {- Console.Error.WriteLine(string.Concat("fileA :", ListCompare.InputFileNotFound));- return -1;- }-- if (FileB == null || !FileB.Exists)- {- Console.Error.WriteLine(string.Concat("fileB :", ListCompare.InputFileNotFound));- return -1;- }-- using Stream fileAStream = _fileStorage.OpenReadFile(FileA.FullName);- using var readerFileA = new StreamReader(fileAStream);- string fileAContent = await readerFileA.ReadToEndAsync(cancellationToken);-- using Stream fileBStream = _fileStorage.OpenReadFile(FileA.FullName);- using var readerFileB = new StreamReader(fileBStream);- string fileBContent = await readerFileB.ReadToEndAsync(cancellationToken);-- ResultInfo<string> output = ListCompareHelper.Compare(fileAContent, fileBContent, IsCaseSensitive, ComparisonMode, logger);- cancellationToken.ThrowIfCancellationRequested();-- if (output.HasSucceeded)- {- await FileHelper.WriteOutputAsync(output.Data, OutputFile, cancellationToken);- return 0;- }- else- {- Console.Error.WriteLine(output.Data);- return -1;- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Text/ListCompare/ListCompareGuiTool.cs b/src/app/dev/DevToys.Tools/Tools/Text/ListCompare/ListCompareGuiTool.csdeleted file mode 100644index 84c3555a5..000000000--- a/src/app/dev/DevToys.Tools/Tools/Text/ListCompare/ListCompareGuiTool.cs+++ /dev/null@@ -1,198 +0,0 @@-using DevToys.Tools.Helpers;-using DevToys.Tools.Models;-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.Tools.Text.ListCompare;--[Export(typeof(IGuiTool))]-[Name("ListCompare")]-[ToolDisplayInformation(- IconFontName = "DevToys-Tools-Icons",- IconGlyph = '\u0137',- GroupName = PredefinedCommonToolGroupNames.Text,- ResourceManagerAssemblyIdentifier = nameof(DevToysToolsResourceManagerAssemblyIdentifier),- ResourceManagerBaseName = "DevToys.Tools.Tools.Text.ListCompare.ListCompare",- ShortDisplayTitleResourceName = nameof(ListCompare.ShortDisplayTitle),- LongDisplayTitleResourceName = nameof(ListCompare.LongDisplayTitle),- DescriptionResourceName = nameof(ListCompare.Description),- AccessibleNameResourceName = nameof(ListCompare.AccessibleName))]-internal sealed class ListCompareGuiTool : IGuiTool-{- /// <summary>- /// Whether the list comparison should be case sensitive or not,- /// </summary>- private static readonly SettingDefinition<bool> caseSensitive- = new(- name: $"{nameof(ListCompareGuiTool)}.{nameof(caseSensitive)}",- defaultValue: false);-- /// <summary>- /// The comparison mode to use.- /// </summary>- private static readonly SettingDefinition<ListComparisonMode> comparisonMode- = new(- name: $"{nameof(ListCompareGuiTool)}.{nameof(comparisonMode)}",- defaultValue: ListComparisonMode.AInterB);-- private enum GridRows- {- Configuration,- Text,- }-- private enum GridColumns- {- Stretch- }-- private string _listA = string.Empty;- private string _listB = string.Empty;-- private readonly DisposableSemaphore _semaphore = new();- private readonly ILogger _logger;- private readonly ISettingsProvider _settingsProvider;- private readonly IUIMultiLineTextInput _diffListResult = MultilineTextInput("text-compare-diff-list-result");- private CancellationTokenSource? _cancellationTokenSource;-- [ImportingConstructor]- public ListCompareGuiTool(ISettingsProvider settingsProvider)- {- _logger = this.Log();- _settingsProvider = settingsProvider;- }-- // For unit tests.- internal Task? WorkTask { get; private set; }-- public UIToolView View- => new(- isScrollable: true,- Grid()- .Rows(- (GridRows.Configuration, Auto),- (GridRows.Text, new UIGridLength(1, UIGridUnitType.Fraction)))- .Columns(- (GridColumns.Stretch, new UIGridLength(1, UIGridUnitType.Fraction)))- .Cells(- Cell(- GridRows.Configuration,- GridColumns.Stretch,-- Stack()- .Vertical()- .WithChildren(- Label()- .Text(ListCompare.Configuration),-- Setting("list-compare-case_insensitive_comparison")- .Icon("FluentSystemIcons", '\uEB59')- .Title(ListCompare.TextCaseSensitiveComparison)- .Handle(_settingsProvider, caseSensitive, OnCaseSensitiveChanged),-- Setting("list-compare-comparison-mode")- .Icon("FluentSystemIcons", '\uF1EE')- .Title(ListCompare.ComparisonOptionTitle)- .Handle(- _settingsProvider,- comparisonMode,- onOptionSelected: OnComparisonModeChanged,- Item(ListCompare.AInterB, ListComparisonMode.AInterB),- Item(ListCompare.AUnionB, ListComparisonMode.AUnionB),- Item(ListCompare.AOnly, ListComparisonMode.AOnly),- Item(ListCompare.BOnly, ListComparisonMode.BOnly)- )- )- ),- Cell(- GridRows.Text,- GridColumns.Stretch,-- SplitGrid()- .Horizontal()- .TopPaneLength(new UIGridLength(1, UIGridUnitType.Fraction))- .BottomPaneLength(new UIGridLength(2, UIGridUnitType.Fraction))- .WithTopPaneChild(- SplitGrid()- .Vertical()- .WithLeftPaneChild(- MultilineTextInput()- .Title(ListCompare.ListA)- .OnTextChanged(OnListAChanged))- .WithRightPaneChild(- MultilineTextInput()- .Title(ListCompare.ListB)- .OnTextChanged(OnListBChanged)))- .WithBottomPaneChild(- _diffListResult- .ReadOnly()- .Extendable())- )));-- public void OnDataReceived(string dataTypeName, object? parsedData)- {- }-- private ValueTask OnCaseSensitiveChanged(bool caseSensitive)- {- StartCompare();- return ValueTask.CompletedTask;- }-- private ValueTask OnListAChanged(string listA)- {- _listA = listA;- StartCompare();- return ValueTask.CompletedTask;- }-- private ValueTask OnListBChanged(string listB)- {- _listB = listB;- StartCompare();- return ValueTask.CompletedTask;- }-- private void OnComparisonModeChanged(ListComparisonMode col)- {- StartCompare();- }-- private void StartCompare()- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _cancellationTokenSource = new CancellationTokenSource();-- WorkTask = CompareAsync(_listA, _listB, _settingsProvider.GetSetting(caseSensitive), _settingsProvider.GetSetting(comparisonMode), _cancellationTokenSource.Token);- }-- private async Task CompareAsync(string listA, string listB, bool caseSensitive, ListComparisonMode listComparisonMode, CancellationToken cancellationToken)- {- using (await _semaphore.WaitAsync(cancellationToken))- {- ResultInfo<string> result = ListCompareHelper.Compare(- listA,- listB,- caseSensitive,- listComparisonMode,- _logger);-- if (cancellationToken.IsCancellationRequested)- {- return;- }-- Guard.IsNotNull(result);- string selectedComparisonModeTitle = _settingsProvider.GetSetting(comparisonMode) switch- {- ListComparisonMode.AInterB => ListCompare.AInterB,- ListComparisonMode.AUnionB => ListCompare.AUnionB,- ListComparisonMode.AOnly => ListCompare.AOnly,- ListComparisonMode.BOnly => ListCompare.BOnly,- _ => string.Empty,- };- _diffListResult.Title(selectedComparisonModeTitle);- _diffListResult.Text(result.Data!);- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Text/MarkdownPreview/MarkdownPreview.Designer.cs b/src/app/dev/DevToys.Tools/Tools/Text/MarkdownPreview/MarkdownPreview.Designer.csdeleted file mode 100644index d36a9de14..000000000--- a/src/app/dev/DevToys.Tools/Tools/Text/MarkdownPreview/MarkdownPreview.Designer.cs+++ /dev/null@@ -1,171 +0,0 @@-//-------------------------------------------------------------------------------// <auto-generated>-// This code was generated by a tool.-// Runtime Version:4.0.30319.42000-//-// Changes to this file may cause incorrect behavior and will be lost if-// the code is regenerated.-// </auto-generated>-//--------------------------------------------------------------------------------namespace DevToys.Tools.Tools.Text.MarkdownPreview {- using System;--- /// <summary>- /// A strongly-typed resource class, for looking up localized strings, etc.- /// </summary>- // This class was auto-generated by the StronglyTypedResourceBuilder- // class via a tool like ResGen or Visual Studio.- // To add or remove a member, edit your .ResX file then rerun ResGen- // with the /str option, or rebuild your VS project.- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]- internal class MarkdownPreview {-- private static global::System.Resources.ResourceManager resourceMan;-- private static global::System.Globalization.CultureInfo resourceCulture;-- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]- internal MarkdownPreview() {- }-- /// <summary>- /// Returns the cached ResourceManager instance used by this class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Resources.ResourceManager ResourceManager {- get {- if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Tools.Tools.Text.MarkdownPreview.MarkdownPreview", typeof(MarkdownPreview).Assembly);- resourceMan = temp;- }- return resourceMan;- }- }-- /// <summary>- /// Overrides the current thread's CurrentUICulture property for all- /// resource lookups using this strongly typed resource class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Globalization.CultureInfo Culture {- get {- return resourceCulture;- }- set {- resourceCulture = value;- }- }-- /// <summary>- /// Looks up a localized string similar to Markdown preview tool.- /// </summary>- internal static string AccessibleName {- get {- return ResourceManager.GetString("AccessibleName", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Configuration.- /// </summary>- internal static string Configuration {- get {- return ResourceManager.GetString("Configuration", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Dark.- /// </summary>- internal static string DarkTheme {- get {- return ResourceManager.GetString("DarkTheme", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Preview a Markdown document with a GitHub-like render.- /// </summary>- internal static string Description {- get {- return ResourceManager.GetString("Description", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Markdown.- /// </summary>- internal static string Input {- get {- return ResourceManager.GetString("Input", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Light.- /// </summary>- internal static string LightTheme {- get {- return ResourceManager.GetString("LightTheme", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Markdown Preview.- /// </summary>- internal static string LongDisplayTitle {- get {- return ResourceManager.GetString("LongDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Preview.- /// </summary>- internal static string Output {- get {- return ResourceManager.GetString("Output", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to MD.- /// </summary>- internal static string SearchKeywords {- get {- return ResourceManager.GetString("SearchKeywords", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Markdown Preview.- /// </summary>- internal static string ShortDisplayTitle {- get {- return ResourceManager.GetString("ShortDisplayTitle", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Select which theme to use to preview the Markdown.- /// </summary>- internal static string ThemeDescription {- get {- return ResourceManager.GetString("ThemeDescription", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Theme.- /// </summary>- internal static string ThemeTitle {- get {- return ResourceManager.GetString("ThemeTitle", resourceCulture);- }- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Text/MarkdownPreview/MarkdownPreview.resx b/src/app/dev/DevToys.Tools/Tools/Text/MarkdownPreview/MarkdownPreview.resxdeleted file mode 100644index 8869d465c..000000000--- a/src/app/dev/DevToys.Tools/Tools/Text/MarkdownPreview/MarkdownPreview.resx+++ /dev/null@@ -1,156 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<root>- <!--- Microsoft ResX Schema-- Version 2.0-- The primary goals of this format is to allow a simple XML format- that is mostly human readable. The generation and parsing of the- various data types are done through the TypeConverter classes- associated with the data types.-- Example:-- ... ado.net/XML headers & schema ...- <resheader name="resmimetype">text/microsoft-resx</resheader>- <resheader name="version">2.0</resheader>- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">- <value>[base64 mime encoded serialized .NET Framework object]</value>- </data>- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>- <comment>This is a comment</comment>- </data>-- There are any number of "resheader" rows that contain simple- name/value pairs.-- Each data row contains a name, and value. The row also contains a- type or mimetype. Type corresponds to a .NET class that support- text/value conversion through the TypeConverter architecture.- Classes that don't support this are serialized and stored with the- mimetype set.-- The mimetype is used for serialized objects, and tells the- ResXResourceReader how to depersist the object. This is currently not- extensible. For a given mimetype the value must be set accordingly:-- Note - application/x-microsoft.net.object.binary.base64 is the format- that the ResXResourceWriter will generate, however the reader can- read any of the formats listed below.-- mimetype: application/x-microsoft.net.object.binary.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.soap.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.bytearray.base64- value : The object must be serialized into a byte array- : using a System.ComponentModel.TypeConverter- : and then encoded with base64 encoding.- -->- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />- <xsd:element name="root" msdata:IsDataSet="true">- <xsd:complexType>- <xsd:choice maxOccurs="unbounded">- <xsd:element name="metadata">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" />- </xsd:sequence>- <xsd:attribute name="name" use="required" type="xsd:string" />- <xsd:attribute name="type" type="xsd:string" />- <xsd:attribute name="mimetype" type="xsd:string" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="assembly">- <xsd:complexType>- <xsd:attribute name="alias" type="xsd:string" />- <xsd:attribute name="name" type="xsd:string" />- </xsd:complexType>- </xsd:element>- <xsd:element name="data">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="resheader">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" />- </xsd:complexType>- </xsd:element>- </xsd:choice>- </xsd:complexType>- </xsd:element>- </xsd:schema>- <resheader name="resmimetype">- <value>text/microsoft-resx</value>- </resheader>- <resheader name="version">- <value>2.0</value>- </resheader>- <resheader name="reader">- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <resheader name="writer">- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <data name="AccessibleName" xml:space="preserve">- <value>Markdown preview tool</value>- </data>- <data name="Configuration" xml:space="preserve">- <value>Configuration</value>- </data>- <data name="DarkTheme" xml:space="preserve">- <value>Dark</value>- </data>- <data name="Description" xml:space="preserve">- <value>Preview a Markdown document with a GitHub-like render</value>- </data>- <data name="Input" xml:space="preserve">- <value>Markdown</value>- </data>- <data name="LightTheme" xml:space="preserve">- <value>Light</value>- </data>- <data name="LongDisplayTitle" xml:space="preserve">- <value>Markdown Preview</value>- </data>- <data name="Output" xml:space="preserve">- <value>Preview</value>- </data>- <data name="SearchKeywords" xml:space="preserve">- <value>MD</value>- </data>- <data name="ShortDisplayTitle" xml:space="preserve">- <value>Markdown Preview</value>- </data>- <data name="ThemeDescription" xml:space="preserve">- <value>Select which theme to use to preview the Markdown</value>- </data>- <data name="ThemeTitle" xml:space="preserve">- <value>Theme</value>- </data>-</root>\ No newline at end of filediff --git a/src/app/dev/DevToys.Tools/Tools/Text/MarkdownPreview/MarkdownPreviewGuiTool.cs b/src/app/dev/DevToys.Tools/Tools/Text/MarkdownPreview/MarkdownPreviewGuiTool.csdeleted file mode 100644index aad28e5c1..000000000--- a/src/app/dev/DevToys.Tools/Tools/Text/MarkdownPreview/MarkdownPreviewGuiTool.cs+++ /dev/null@@ -1,200 +0,0 @@-using System.Reflection;-using ColorCode.Styling;-using DevToys.Tools.Models;-using Markdig;-using Markdown.ColorCode;-using Microsoft.Extensions.Logging;--namespace DevToys.Tools.Tools.Text.MarkdownPreview;--[Export(typeof(IGuiTool))]-[Name("MarkdownPreview")]-[ToolDisplayInformation(- IconFontName = "DevToys-Tools-Icons",- IconGlyph = '\u0112',- GroupName = PredefinedCommonToolGroupNames.Text,- ResourceManagerAssemblyIdentifier = nameof(DevToysToolsResourceManagerAssemblyIdentifier),- ResourceManagerBaseName = "DevToys.Tools.Tools.Text.MarkdownPreview.MarkdownPreview",- ShortDisplayTitleResourceName = nameof(MarkdownPreview.ShortDisplayTitle),- LongDisplayTitleResourceName = nameof(MarkdownPreview.LongDisplayTitle),- DescriptionResourceName = nameof(MarkdownPreview.Description),- AccessibleNameResourceName = nameof(MarkdownPreview.AccessibleName),- SearchKeywordsResourceName = nameof(MarkdownPreview.SearchKeywords))]-[AcceptedDataTypeName("Markdown")]-internal sealed class MarkdownPreviewGuiTool : IGuiTool, IDisposable-{- /// <summary>- /// Whether the markdown should be previewed in dark or light theme.- /// </summary>- private static readonly SettingDefinition<MarkdownPreviewTheme> theme- = new(- name: $"{nameof(MarkdownPreviewGuiTool)}.{nameof(theme)}",- defaultValue: MarkdownPreviewTheme.Light);-- private enum GridRows- {- TopAuto,- Stretch,- }-- private enum GridColumns- {- Stretch- }-- private readonly DisposableSemaphore _semaphore = new();- private readonly ILogger _logger;- private readonly ISettingsProvider _settingsProvider;- private readonly IUIWebView _webView = WebView();- private readonly IUIMultiLineTextInput _inputText = MultilineTextInput();- private readonly Lazy<string> _githubMarkdownIndexPage = new(() => ReadEmbeddedResource("index.html"));-- private CancellationTokenSource? _cancellationTokenSource;-- [ImportingConstructor]- public MarkdownPreviewGuiTool(ISettingsProvider settingsProvider, IThemeListener themeListener)- {- _logger = this.Log();- _settingsProvider = settingsProvider;-- // Override the theme with the one defined in the app settings.- _settingsProvider.SetSetting(- theme,- themeListener.ActualAppTheme == ApplicationTheme.Dark- ? MarkdownPreviewTheme.Dark- : MarkdownPreviewTheme.Light);- }-- // For unit tests.- internal Task? WorkTask { get; private set; }-- public UIToolView View- => new(- isScrollable: false,- Grid()- .ColumnMediumSpacing()-- .Rows(- (GridRows.TopAuto, Auto),- (GridRows.Stretch, new UIGridLength(1, UIGridUnitType.Fraction)))-- .Columns(- (GridColumns.Stretch, new UIGridLength(1, UIGridUnitType.Fraction)))-- .Cells(- Cell(- GridRows.TopAuto,- GridColumns.Stretch,-- Stack()- .Vertical()-- .WithChildren(- Label().Text(MarkdownPreview.Configuration),-- Setting()- .Icon("FluentSystemIcons", '\uF591')- .Title(MarkdownPreview.ThemeTitle)- .Description(MarkdownPreview.ThemeDescription)- .Handle(- _settingsProvider,- theme,- OnThemeChanged,- Item(MarkdownPreview.DarkTheme, MarkdownPreviewTheme.Dark),- Item(MarkdownPreview.LightTheme, MarkdownPreviewTheme.Light)))),-- Cell(- GridRows.Stretch,- GridColumns.Stretch,-- SplitGrid()- .Vertical()- .LeftPaneLength(new UIGridLength(1, UIGridUnitType.Fraction))- .RightPaneLength(new UIGridLength(1, UIGridUnitType.Fraction))-- .WithLeftPaneChild(- _inputText- .Title(MarkdownPreview.Input)- .Language("markdown")- .CanCopyWhenEditable()- .OnTextChanged(OnInputTextChanged))-- .WithRightPaneChild(- _webView- .Title(MarkdownPreview.Output)))));-- public void OnDataReceived(string dataTypeName, object? parsedData)- {- if (dataTypeName == "Markdown" && parsedData is string markdown)- {- _inputText.Text(markdown); // This will trigger an update of the preview.- }- }-- public void Dispose()- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _semaphore.Dispose();- }-- private void OnThemeChanged(MarkdownPreviewTheme _)- {- StartPreview();- }-- private void OnInputTextChanged(string _)- {- StartPreview();- }-- private void StartPreview()- {- _cancellationTokenSource?.Cancel();- _cancellationTokenSource?.Dispose();- _cancellationTokenSource = new CancellationTokenSource();-- WorkTask = PreviewAsync(_inputText.Text, _settingsProvider.GetSetting(theme), _cancellationTokenSource.Token);- }-- private async Task PreviewAsync(string markdown, MarkdownPreviewTheme theme, CancellationToken cancellationToken)- {- using (await _semaphore.WaitAsync(cancellationToken))- {- await TaskSchedulerAwaiter.SwitchOffMainThreadAsync(cancellationToken);-- StyleDictionary codeStyleDictionary = theme == MarkdownPreviewTheme.Dark- ? StyleDictionary.DefaultDark- : StyleDictionary.DefaultLight;-- MarkdownPipeline pipeline- = new MarkdownPipelineBuilder()- .UseEmojiAndSmiley()- .UseSmartyPants()- .UseAdvancedExtensions()- .UseColorCode(styleDictionary: codeStyleDictionary)- .EnableTrackTrivia()- .UseYamlFrontMatter()- .Build();-- string? htmlBody = Markdig.Markdown.ToHtml(markdown, pipeline);-- string htmlDocument- = _githubMarkdownIndexPage.Value- .Replace("{{renderTheme}}", theme.ToString().ToLower())- .Replace("{{htmlBody}}", htmlBody);-- _webView.RenderHTML(htmlDocument);- }- }-- private static string ReadEmbeddedResource(string name)- {- var assembly = Assembly.GetExecutingAssembly();- string resourceName = $"DevToys.Tools.Assets.GitHubMarkdown.{name}";-- using Stream stream = assembly.GetManifestResourceStream(resourceName)!;- using StreamReader reader = new(stream);- return reader.ReadToEnd();- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Text/Text.Designer.cs b/src/app/dev/DevToys.Tools/Tools/Text/Text.Designer.csdeleted file mode 100644index b6a353b48..000000000--- a/src/app/dev/DevToys.Tools/Tools/Text/Text.Designer.cs+++ /dev/null@@ -1,81 +0,0 @@-//-------------------------------------------------------------------------------// <auto-generated>-// This code was generated by a tool.-// Runtime Version:4.0.30319.42000-//-// Changes to this file may cause incorrect behavior and will be lost if-// the code is regenerated.-// </auto-generated>-//--------------------------------------------------------------------------------namespace DevToys.Tools.Tools.Text {- using System;--- /// <summary>- /// A strongly-typed resource class, for looking up localized strings, etc.- /// </summary>- // This class was auto-generated by the StronglyTypedResourceBuilder- // class via a tool like ResGen or Visual Studio.- // To add or remove a member, edit your .ResX file then rerun ResGen- // with the /str option, or rebuild your VS project.- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]- internal class Text {-- private static global::System.Resources.ResourceManager resourceMan;-- private static global::System.Globalization.CultureInfo resourceCulture;-- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]- internal Text() {- }-- /// <summary>- /// Returns the cached ResourceManager instance used by this class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Resources.ResourceManager ResourceManager {- get {- if (object.ReferenceEquals(resourceMan, null)) {- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevToys.Tools.Tools.Text.Text", typeof(Text).Assembly);- resourceMan = temp;- }- return resourceMan;- }- }-- /// <summary>- /// Overrides the current thread's CurrentUICulture property for all- /// resource lookups using this strongly typed resource class.- /// </summary>- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]- internal static global::System.Globalization.CultureInfo Culture {- get {- return resourceCulture;- }- set {- resourceCulture = value;- }- }-- /// <summary>- /// Looks up a localized string similar to Text.- /// </summary>- internal static string AccessibleName {- get {- return ResourceManager.GetString("AccessibleName", resourceCulture);- }- }-- /// <summary>- /// Looks up a localized string similar to Text.- /// </summary>- internal static string DisplayTitle {- get {- return ResourceManager.GetString("DisplayTitle", resourceCulture);- }- }- }-}diff --git a/src/app/dev/DevToys.Tools/Tools/Text/Text.resx b/src/app/dev/DevToys.Tools/Tools/Text/Text.resxdeleted file mode 100644index 8c9f51c3d..000000000--- a/src/app/dev/DevToys.Tools/Tools/Text/Text.resx+++ /dev/null@@ -1,126 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<root>- <!--- Microsoft ResX Schema-- Version 2.0-- The primary goals of this format is to allow a simple XML format- that is mostly human readable. The generation and parsing of the- various data types are done through the TypeConverter classes- associated with the data types.-- Example:-- ... ado.net/XML headers & schema ...- <resheader name="resmimetype">text/microsoft-resx</resheader>- <resheader name="version">2.0</resheader>- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">- <value>[base64 mime encoded serialized .NET Framework object]</value>- </data>- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>- <comment>This is a comment</comment>- </data>-- There are any number of "resheader" rows that contain simple- name/value pairs.-- Each data row contains a name, and value. The row also contains a- type or mimetype. Type corresponds to a .NET class that support- text/value conversion through the TypeConverter architecture.- Classes that don't support this are serialized and stored with the- mimetype set.-- The mimetype is used for serialized objects, and tells the- ResXResourceReader how to depersist the object. This is currently not- extensible. For a given mimetype the value must be set accordingly:-- Note - application/x-microsoft.net.object.binary.base64 is the format- that the ResXResourceWriter will generate, however the reader can- read any of the formats listed below.-- mimetype: application/x-microsoft.net.object.binary.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.soap.base64- value : The object must be serialized with- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter- : and then encoded with base64 encoding.-- mimetype: application/x-microsoft.net.object.bytearray.base64- value : The object must be serialized into a byte array- : using a System.ComponentModel.TypeConverter- : and then encoded with base64 encoding.- -->- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />- <xsd:element name="root" msdata:IsDataSet="true">- <xsd:complexType>- <xsd:choice maxOccurs="unbounded">- <xsd:element name="metadata">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" />- </xsd:sequence>- <xsd:attribute name="name" use="required" type="xsd:string" />- <xsd:attribute name="type" type="xsd:string" />- <xsd:attribute name="mimetype" type="xsd:string" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="assembly">- <xsd:complexType>- <xsd:attribute name="alias" type="xsd:string" />- <xsd:attribute name="name" type="xsd:string" />- </xsd:complexType>- </xsd:element>- <xsd:element name="data">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />- <xsd:attribute ref="xml:space" />- </xsd:complexType>- </xsd:element>- <xsd:element name="resheader">- <xsd:complexType>- <xsd:sequence>- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />- </xsd:sequence>- <xsd:attribute name="name" type="xsd:string" use="required" />- </xsd:complexType>- </xsd:element>- </xsd:choice>- </xsd:complexType>- </xsd:element>- </xsd:schema>- <resheader name="resmimetype">- <value>text/microsoft-resx</value>- </resheader>- <resheader name="version">- <value>2.0</value>- </resheader>- <resheader name="reader">- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <resheader name="writer">- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>- </resheader>- <data name="AccessibleName" xml:space="preserve">- <value>Text</value>- </data>- <data name="DisplayTitle" xml:space="preserve">- <value>Text</value>- </data>-</root>\ No newline at end of filediff --git a/src/app/dev/Directory.Build.props b/src/app/dev/Directory.Build.propsindex d3e680c7e..e7cc26320 100644--- a/src/app/dev/Directory.Build.props+++ b/src/app/dev/Directory.Build.props@@ -3,7 +3,7 @@<PropertyGroup><!-- Define .NET and C# configuration -->- <LangVersion>11.0</LangVersion>+ <LangVersion>latest</LangVersion><ImplicitUsings>enable</ImplicitUsings><Nullable>enable</Nullable><GenerateAssemblyInfo>false</GenerateAssemblyInfo>diff --git a/src/app/dev/platforms/desktop/Directory.Build.props b/src/app/dev/platforms/desktop/Directory.Build.propsdeleted file mode 100644index 0d618414d..000000000--- a/src/app/dev/platforms/desktop/Directory.Build.props+++ /dev/null@@ -1,13 +0,0 @@-<Project>- <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />-- <PropertyGroup Condition="$(_IsPublishing) == 'true'">- <PluginsInstallationFolder>$(PublishDir)\Plugins</PluginsInstallationFolder>- </PropertyGroup>-- <ItemGroup>- <!-- HACK: This force MSBuild to check whether we rebuilt a plugin. If yes, then it forces to rebuild the current- project and unpack the nupkg so we can debug a change we made to an extension. -->- <UpToDateCheckInput Include="$(PluginNupkgPath)\**\*.nupkg" />- </ItemGroup>-</Project>\ No newline at end of filediff --git a/src/app/dev/platforms/desktop/Directory.Build.targets b/src/app/dev/platforms/desktop/Directory.Build.targetsdeleted file mode 100644index 775e40aa5..000000000--- a/src/app/dev/platforms/desktop/Directory.Build.targets+++ /dev/null@@ -1,52 +0,0 @@-<Project>- <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />-- <Target Name="ImportPluginOnBuild" BeforeTargets="CheckForDuplicateItems" Condition="$(_IsPublishing) == ''">- <CallTarget Targets="ImportPlugins" />- </Target>-- <Target Name="ImportPluginOnPublish" BeforeTargets="Publish">- <CallTarget Targets="ImportPlugins" />- </Target>-- <Target Name="ImportPlugins">- <Message Text="Importing plugins in '$(PluginsInstallationFolder)'..." Importance="high" />-- <ItemGroup>- <PluginNupkgFiles Include="$(PluginNupkgPath)\*.nupkg" />- </ItemGroup>-- <MSBuild Projects="$(MSBuildProjectFile)"- Properties="NupkgFile=%(PluginNupkgFiles.Identity)"- Targets="UnzipNupkg"- ContinueOnError="false"- RunEachTargetSeparately="true">- </MSBuild>-- <Message Text="Plugins imported!" Importance="high" />- </Target>-- <Target Name="UnzipNupkg">- <Message Text="Extracting plugin '$(NupkgFile)'..." Importance="high" />-- <PropertyGroup>- <FileNameWithoutExtension>$([System.IO.Path]::GetFileNameWithoutExtension($(NupkgFile)))</FileNameWithoutExtension>- <FileNameWithoutExtensionAndVersionNumber>$([System.String]::Copy('$(FileNameWithoutExtension)').Split('.')[0]).$([System.String]::Copy('$(FileNameWithoutExtension)').Split('.')[1])</FileNameWithoutExtensionAndVersionNumber>- </PropertyGroup>-- <MakeDir Directories="$(PluginsInstallationFolder)/$(FileNameWithoutExtensionAndVersionNumber)"/>-- <!-- Use powershell on Windows. -->- <Exec- Condition="$(IsWindows) == 'true'"- Command="powershell -Command Copy-Item -Force "$(NupkgFile)" "$(NupkgFile).zip"" />- <Exec- Condition="$(IsWindows) == 'true'"- Command="powershell -Command Expand-Archive -Force -Path "$(NupkgFile).zip" -DestinationPath "$(PluginsInstallationFolder)/$(FileNameWithoutExtensionAndVersionNumber)"" />-- <!-- Use bash on Mac and Linux. -->- <Exec- Condition="$(IsWindows) != 'true'"- Command="bash -c "unzip -o $(NupkgFile) -d $(PluginsInstallationFolder)/$(FileNameWithoutExtensionAndVersionNumber) "" />- </Target>-</Project>\ No newline at end of filediff --git a/src/app/dev/shared/SharedAssemblyInfo.cs b/src/app/dev/shared/SharedAssemblyInfo.csindex 098327531..1ceeab946 100644--- a/src/app/dev/shared/SharedAssemblyInfo.cs+++ b/src/app/dev/shared/SharedAssemblyInfo.cs@@ -15,9 +15,9 @@ using System.Runtime.CompilerServices;// associated with an assembly.[assembly: AssemblyDescription("")][assembly: AssemblyConfiguration("")]-[assembly: AssemblyCompany("Etienne Baudoux")]+[assembly: AssemblyCompany("DevToys")][assembly: AssemblyProduct("DevToys")]-[assembly: AssemblyCopyright("© Etienne Baudoux. All rights reserved.")]+[assembly: AssemblyCopyright("© Etienne Baudoux & Benjamin Titeux. All rights reserved.")][assembly: AssemblyTrademark("")][assembly: AssemblyCulture("")]diff --git a/src/app/tests/DevToys.UnitTests/Blazor/BuiltInDataTypeDetectors/Base64TextDataTypeDetectorTests.cs b/src/app/tests/DevToys.UnitTests/Blazor/BuiltInDataTypeDetectors/Base64TextDataTypeDetectorTests.csnew file mode 100644index 000000000..fb12e842d--- /dev/null+++ b/src/app/tests/DevToys.UnitTests/Blazor/BuiltInDataTypeDetectors/Base64TextDataTypeDetectorTests.cs@@ -0,0 +1,30 @@+using System.Threading.Tasks;+using DevToys.Blazor.BuiltInDataTypeDetectors;+using Microsoft.Extensions.Logging;++namespace DevToys.UnitTests.Blazor.BuiltInDataTypeDetectors;++public class Base64TextDataTypeDetectorTests+{+ [Theory]+ [InlineData(null, false)]+ [InlineData("", false)]+ [InlineData(" ", false)]+ [InlineData("aGVsbG8gd29ybGQ=", true)]+ [InlineData("aGVsbG8gd2f9ybGQ=", false)]+ [InlineData("SGVsbG8gV29y", true)]+ [InlineData("SGVsbG8gVa29y", false)]+ public async Task TryDetectDataAsync(string input, bool expectedResult)+ {+ LoggingExtensions.LoggerFactory ??= LoggerFactory.Create(builder => { });++ DataDetectionResult dataDetectionResult = new(false, input);+ Base64TextDataTypeDetector sut = new();+ DataDetectionResult result = await sut.TryDetectDataAsync(+ input,+ dataDetectionResult,+ default);++ result.Success.Should().Be(expectedResult);+ }+}diff --git a/src/app/tests/DevToys.UnitTests/Blazor/BuiltInDataTypeDetectors/GZipDataTypeDetectorTests.cs b/src/app/tests/DevToys.UnitTests/Blazor/BuiltInDataTypeDetectors/GZipDataTypeDetectorTests.csnew file mode 100644index 000000000..5e44b1185--- /dev/null+++ b/src/app/tests/DevToys.UnitTests/Blazor/BuiltInDataTypeDetectors/GZipDataTypeDetectorTests.cs@@ -0,0 +1,33 @@+using System.Threading.Tasks;+using DevToys.Blazor.BuiltInDataTypeDetectors;+using Microsoft.Extensions.Logging;++namespace DevToys.UnitTests.Blazor.BuiltInDataTypeDetectors;++public class GZipDataTypeDetectorTests+{+ [Theory]+ [InlineData(null, false)]+ [InlineData("", false)]+ [InlineData(" ", false)]+ [InlineData(" ", false)]+ [InlineData("H4sIAAAAAAAAC/NIzcnJBwCCidH3BQAAAA==", true)]+ [InlineData(" H4sIAAAAAAAAC/NIzcnJBwCCidH3BQAAAA==", true)]+ [InlineData(" H4sIAAAAAAAAC/NIzcnJBwCCidH3BQAAAA==", true)]+ [InlineData("H4sI", true)]+ [InlineData("H4sIA", true)]+ [InlineData("H4s", false)]+ public async Task TryDetectDataAsync(string input, bool expectedResult)+ {+ LoggingExtensions.LoggerFactory ??= LoggerFactory.Create(builder => { });++ DataDetectionResult dataDetectionResult = new(false, input);+ GZipTextDataTypeDetector sut = new();+ DataDetectionResult result = await sut.TryDetectDataAsync(+ input,+ dataDetectionResult,+ default);++ result.Success.Should().Be(expectedResult);+ }+}diff --git a/src/app/tests/DevToys.UnitTests/Tools/SmartDetection/JsonArrayDataTypeDetectorTests.cs b/src/app/tests/DevToys.UnitTests/Blazor/BuiltInDataTypeDetectors/JsonArrayDataTypeDetectorTests.cssimilarity index 86%rename from src/app/tests/DevToys.UnitTests/Tools/SmartDetection/JsonArrayDataTypeDetectorTests.csrename to src/app/tests/DevToys.UnitTests/Blazor/BuiltInDataTypeDetectors/JsonArrayDataTypeDetectorTests.csindex 6235ef3a3..f13bdec59 100644--- a/src/app/tests/DevToys.UnitTests/Tools/SmartDetection/JsonArrayDataTypeDetectorTests.cs+++ b/src/app/tests/DevToys.UnitTests/Blazor/BuiltInDataTypeDetectors/JsonArrayDataTypeDetectorTests.cs@@ -1,9 +1,8 @@-using System.Diagnostics.CodeAnalysis;-using System.Threading.Tasks;-using DevToys.Tools.SmartDetection;+using System.Threading.Tasks;+using DevToys.Blazor.BuiltInDataTypeDetectors;using Microsoft.Extensions.Logging;-namespace DevToys.UnitTests.Tools.SmartDetection;+namespace DevToys.UnitTests.Blazor.BuiltInDataTypeDetectors;public class JsonArrayDataTypeDetectorTests{diff --git a/src/app/tests/DevToys.UnitTests/Tools/SmartDetection/JsonDataTypeDetectorTests.cs b/src/app/tests/DevToys.UnitTests/Blazor/BuiltInDataTypeDetectors/JsonDataTypeDetectorTests.cssimilarity index 72%rename from src/app/tests/DevToys.UnitTests/Tools/SmartDetection/JsonDataTypeDetectorTests.csrename to src/app/tests/DevToys.UnitTests/Blazor/BuiltInDataTypeDetectors/JsonDataTypeDetectorTests.csindex 93aec3999..59fa447bc 100644--- a/src/app/tests/DevToys.UnitTests/Tools/SmartDetection/JsonDataTypeDetectorTests.cs+++ b/src/app/tests/DevToys.UnitTests/Blazor/BuiltInDataTypeDetectors/JsonDataTypeDetectorTests.cs@@ -1,13 +1,18 @@-using System.Diagnostics.CodeAnalysis;-using System.Threading.Tasks;-using DevToys.Tools.SmartDetection;+using System.Threading.Tasks;+using DevToys.Blazor.BuiltInDataTypeDetectors;using Microsoft.Extensions.Logging;-namespace DevToys.UnitTests.Tools.SmartDetection;+namespace DevToys.UnitTests.Blazor.BuiltInDataTypeDetectors;public class JsonDataTypeDetectorTests{[Theory]+ [InlineData("\"foo\"", true)]+ [InlineData("123", false)]+ [InlineData(" { } ", true)]+ [InlineData(" [ ] ", true)]+ [InlineData(" { \"foo\": 123 } ", true)]+ [InlineData(" bar { \"foo\": 123 } ", false)][InlineData(null, false)][InlineData("", false)][InlineData(" ", false)]diff --git a/src/app/tests/DevToys.UnitTests/Tools/SmartDetection/XmlDataTypeDetectorTests.cs b/src/app/tests/DevToys.UnitTests/Blazor/BuiltInDataTypeDetectors/XmlDataTypeDetectorTests.cssimilarity index 69%rename from src/app/tests/DevToys.UnitTests/Tools/SmartDetection/XmlDataTypeDetectorTests.csrename to src/app/tests/DevToys.UnitTests/Blazor/BuiltInDataTypeDetectors/XmlDataTypeDetectorTests.csindex fb5e2bd23..912d9c14a 100644--- a/src/app/tests/DevToys.UnitTests/Tools/SmartDetection/XmlDataTypeDetectorTests.cs+++ b/src/app/tests/DevToys.UnitTests/Blazor/BuiltInDataTypeDetectors/XmlDataTypeDetectorTests.cs@@ -1,9 +1,8 @@-using System.Diagnostics.CodeAnalysis;-using System.Threading.Tasks;-using DevToys.Tools.SmartDetection;+using System.Threading.Tasks;+using DevToys.Blazor.BuiltInDataTypeDetectors;using Microsoft.Extensions.Logging;-namespace DevToys.UnitTests.Tools.SmartDetection;+namespace DevToys.UnitTests.Blazor.BuiltInDataTypeDetectors;public class XmlDataTypeDetectorTests{@@ -11,7 +10,12 @@ public class XmlDataTypeDetectorTests[InlineData(null, false)][InlineData("", false)][InlineData(" ", false)]+ [InlineData("<>", false)]+ [InlineData("</>", false)][InlineData("<xml />", true)]+ [InlineData("<root><xml /></root> ", true)]+ [InlineData(" <root><xml test=\"true\" /></root>", true)]+ [InlineData(" <root><xml test=\"true\" /></root ", false)][InlineData("<root><xml /></root>", true)][InlineData("<root><xml test=\"true\" /></root>", true)][InlineData(" <root>\r\n\t<xml test=\"true\" />\r\n</root>", true)]diff --git a/src/app/tests/DevToys.UnitTests/DevToys.UnitTests.csproj b/src/app/tests/DevToys.UnitTests/DevToys.UnitTests.csprojindex 206281afb..e385bab63 100644--- a/src/app/tests/DevToys.UnitTests/DevToys.UnitTests.csproj+++ b/src/app/tests/DevToys.UnitTests/DevToys.UnitTests.csproj@@ -3,173 +3,9 @@<PropertyGroup><TargetFrameworks>$(NetCore)</TargetFrameworks><IsPackable>false</IsPackable>+ <IsTestProject>true</IsTestProject></PropertyGroup>- <ItemGroup>- <Compile Remove="Tools\TestData\XmlValidator\**" />- <EmbeddedResource Remove="Tools\TestData\XmlValidator\**" />- <None Remove="Tools\TestData\XmlValidator\**" />- </ItemGroup>-- <ItemGroup>- <None Remove="Tools\TestData\JsonWebTokenEncoderDecoder\BasicPayload.json" />- <None Remove="Tools\TestData\JsonWebTokenEncoderDecoder\ComplexPayload.json" />- <None Remove="Tools\TestData\JsonWebTokenEncoderDecoder\RS\RS256-EncryptedComplexToken.txt" />- <None Remove="Tools\TestData\JsonWebTokenEncoderDecoder\RS\RS256-EncryptedPrivateKey.txt" />- <None Remove="Tools\TestData\JsonWebTokenEncoderDecoder\RS\RS256-EncryptedPublicKey.txt" />- </ItemGroup>-- <ItemGroup>- <Content Include="Tools\TestData\Base64ImageEncoderDecoder\PNG_transparency_demonstration_1.png">- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>- </Content>- <Content Include="Tools\TestData\Base64ImageEncoderDecoder\Png_transparency_demonstration_1_base64.txt">- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>- </Content>- <Content Include="Tools\TestData\CertificateDecoder\CertDecoded.txt">- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>- </Content>- <Content Include="Tools\TestData\CertificateDecoder\CertificateRequest.txt">- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>- </Content>- <Content Include="Tools\TestData\CertificateDecoder\CertWithExtensionsDecoded.txt">- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>- </Content>- <Content Include="Tools\TestData\CertificateDecoder\PemCertPublic.txt">- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>- </Content>- <Content Include="Tools\TestData\CertificateDecoder\PemCertPublicWithExtensions.txt">- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>- </Content>- <Content Include="Tools\TestData\CertificateDecoder\PemCertWithPrivateKey.txt">- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>- </Content>- <Content Include="Tools\TestData\CertificateDecoder\PemCertWithPrivateKeyWithExtensions.txt">- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>- </Content>- <Content Include="Tools\TestData\CertificateDecoder\PfxNoPassword.pfx">- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>- </Content>- <Content Include="Tools\TestData\CertificateDecoder\PfxWithExtensionsNoPassword.pfx">- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>- </Content>- <Content Include="Tools\TestData\CertificateDecoder\PfxWithPassword.pfx">- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>- </Content>- <Content Include="Tools\TestData\HashAndChecksumGenerator\Checksum.txt">- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>- </Content>- <Content Include="Tools\TestData\HashAndChecksumGenerator\File.txt">- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>- </Content>- <EmbeddedResource Include="Tools\TestData\JsonPathTester\sample.json">- <CopyToOutputDirectory>Never</CopyToOutputDirectory>- </EmbeddedResource>- <Content Include="Tools\TestData\JsonYamlConverter\FourSpaces.json">- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>- </Content>- <Content Include="Tools\TestData\JsonYamlConverter\FourSpaces.yaml">- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>- </Content>- <Content Include="Tools\TestData\JsonYamlConverter\Invalid.json">- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>- </Content>- <Content Include="Tools\TestData\JsonYamlConverter\Invalid.yaml">- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>- </Content>- <Content Include="Tools\TestData\JsonYamlConverter\TwoSpaces.json">- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>- </Content>- <Content Include="Tools\TestData\JsonYamlConverter\TwoSpaces.yaml">- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>- </Content>- <Content Include="Tools\TestData\XmlFormatter\FourSpaces.xml">- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>- </Content>- <Content Include="Tools\TestData\XmlFormatter\Minified.xml">- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>- </Content>- <Content Include="Tools\TestData\XmlFormatter\NewLineOnAttributes.xml">- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>- </Content>- <Content Include="Tools\TestData\XmlFormatter\OneTab.xml">- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>- </Content>- <Content Include="Tools\TestData\XmlFormatter\TwoSpaces.xml">- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>- </Content>- <Content Include="Tools\TestData\XmlFormatter\ValidXml.xml">- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>- </Content>- </ItemGroup>-- <ItemGroup>- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\BasicPayload.json" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\ComplexPayload.json" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\ES\ES256-ComplexToken.txt" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\ES\ES256-Header.json" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\ES\ES256-PrivateKey.txt" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\ES\ES256-PublicKey.txt" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\ES\ES384-ComplexToken.txt" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\ES\ES384-Header.json" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\ES\ES384-PrivateKey.txt" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\ES\ES384-PublicKey.txt" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\ES\ES512-ComplexToken.txt" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\ES\ES512-Header.json" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\ES\ES512-PrivateKey.txt" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\ES\ES512-PublicKey.txt" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\HS\HS256-BasicToken.txt" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\HS\HS256-ComplexToken.txt" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\HS\HS256-Header.json" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\HS\HS256-Signature.txt" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\PS\PS256-Header.json" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\PS\PS256-PrivateKey.txt" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\PS\PS256-ComplexToken.txt" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\PS\PS256-PublicKey.txt" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\PS\PS256-RsaPrivateKey.txt" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\PS\PS256-RsaPublicKey.txt" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\PS\PS384-ComplexToken.txt" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\PS\PS384-Header.json" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\PS\PS384-PrivateKey.txt" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\PS\PS384-PublicKey.txt" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\PS\PS512-ComplexToken.txt" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\PS\PS512-Header.json" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\PS\PS512-PrivateKey.txt" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\PS\PS512-PublicKey.txt" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\RS\RS256-EncryptedComplexToken.txt" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\RS\RS256-EncryptedPublicKey.txt" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\RS\RS256-Header.json" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\RS\RS256-EncryptedPrivateKey.txt" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\RS\RS256-PrivateKey.txt" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\RS\RS256-ComplexToken.txt" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\RS\RS256-PublicKey.txt" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\RS\RS256-RsaPrivateKey.txt" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\RS\RS256-RsaPublicKey.txt" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\RS\RS384-Header.json" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\RS\RS384-PrivateKey.txt" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\RS\RS384-ComplexToken.txt" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\RS\RS384-PublicKey.txt" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\RS\RS512-Header.json" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\RS\RS512-PrivateKey.txt" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\RS\RS512-ComplexToken.txt" />- <EmbeddedResource Include="Tools\TestData\JsonWebTokenEncoderDecoder\RS\RS512-PublicKey.txt" />- <EmbeddedResource Include="Tools\TestData\XmlFormatter\FourSpaces.xml" />- <EmbeddedResource Include="Tools\TestData\XmlFormatter\Minified.xml" />- <EmbeddedResource Include="Tools\TestData\XmlFormatter\NewLineOnAttributes.xml" />- <EmbeddedResource Include="Tools\TestData\XmlFormatter\OneTab.xml" />- <EmbeddedResource Include="Tools\TestData\XmlFormatter\TwoSpaces.xml" />- <EmbeddedResource Include="Tools\TestData\XmlFormatter\ValidXml.xml" />- <EmbeddedResource Include="Tools\TestData\XMLTester\InvalidXml.xml" />- <EmbeddedResource Include="Tools\TestData\XMLTester\InvalidXsd.xml" />- <EmbeddedResource Include="Tools\TestData\XMLTester\ValidXml.xml" />- <EmbeddedResource Include="Tools\TestData\XMLTester\ValidXmlWithNamespace.xml" />- <EmbeddedResource Include="Tools\TestData\XMLTester\ValidXmlWithoutNamespace.xml" />- <EmbeddedResource Include="Tools\TestData\XMLTester\ValidXsd.xml" />- <EmbeddedResource Include="Tools\TestData\XMLTester\ValidXsdOnlyWithTargetNamespace.xml" />- <EmbeddedResource Include="Tools\TestData\XMLTester\ValidXsdWithNamespace.xml" />- <EmbeddedResource Include="Tools\TestData\XMLTester\ValidXsdWithoutNamespace.xml" />- </ItemGroup>-<ItemGroup><PackageReference Include="FluentAssertions" /><PackageReference Include="Microsoft.NET.Test.Sdk" />@@ -190,7 +26,6 @@<ProjectReference Include="..\..\dev\DevToys.Blazor\DevToys.Blazor.csproj" /><ProjectReference Include="..\..\dev\DevToys.Business\DevToys.Business.csproj" /><ProjectReference Include="..\..\dev\DevToys.Core\DevToys.Core.csproj" />- <ProjectReference Include="..\..\dev\DevToys.Tools\DevToys.Tools.csproj" /><ProjectReference Include="..\..\dev\platforms\desktop\DevToys.CLI\DevToys.CLI.csproj" /></ItemGroup>diff --git a/src/app/tests/DevToys.UnitTests/Mocks/Tools/MockDataTypeDetector.cs b/src/app/tests/DevToys.UnitTests/Mocks/Tools/MockDataTypeDetector.csindex 42eb93738..87ff48675 100644--- a/src/app/tests/DevToys.UnitTests/Mocks/Tools/MockDataTypeDetector.cs+++ b/src/app/tests/DevToys.UnitTests/Mocks/Tools/MockDataTypeDetector.cs@@ -1,7 +1,10 @@using System.ComponentModel.Composition;+using System.IO;using System.Threading;using System.Threading.Tasks;-using DevToys.Tools.Helpers;+using Microsoft.Extensions.Logging;+using Newtonsoft.Json;+using Newtonsoft.Json.Linq;namespace DevToys.UnitTests.Mocks.Tools;@@ -15,7 +18,7 @@ internal class MockJsonDataTypeDetector : IDataTypeDetector&& resultFromBaseDetector.Data is string dataString&& !long.TryParse(dataString, out _)){- if (await JsonHelper.IsValidAsync(dataString, new MockILogger(), cancellationToken))+ if (await IsValidAsync(dataString, new MockILogger(), cancellationToken)){return new DataDetectionResult(Success: true, Data: dataString);}@@ -23,6 +26,39 @@ internal class MockJsonDataTypeDetector : IDataTypeDetectorreturn DataDetectionResult.Unsuccessful;}++ /// <summary>+ /// Detects whether the given string is a valid JSON or not.+ /// </summary>+ internal static async ValueTask<bool> IsValidAsync(string input, ILogger logger, CancellationToken cancellationToken)+ {+ if (input == null)+ {+ return true;+ }++ if (long.TryParse(input, out _))+ {+ return false;+ }++ try+ {+ using JsonReader reader = new JsonTextReader(new StringReader(input));+ JToken jtoken = await JToken.LoadAsync(reader, settings: null, cancellationToken);+ return jtoken is not null;+ }+ catch (JsonReaderException)+ {+ // Exception in parsing json. It likely mean the text isn't a JSON.+ return false;+ }+ catch (Exception ex)+ {+ logger.LogError(ex, "Invalid data detected.");+ return false;+ }+ }}[Export(typeof(IDataTypeDetector))]diff --git a/src/app/tests/DevToys.UnitTests/TestDataProvider.cs b/src/app/tests/DevToys.UnitTests/TestDataProvider.csdeleted file mode 100644index 4140e68cf..000000000--- a/src/app/tests/DevToys.UnitTests/TestDataProvider.cs+++ /dev/null@@ -1,48 +0,0 @@-using System.IO;-using System.Reflection;-using System.Threading.Tasks;--namespace DevToys.UnitTests;--internal static class TestDataProvider-{- /// <summary>- /// Retrieves the content of a file.- /// </summary>- /// <param name="filePath">Path to the file relative to <c>DevToys.Tests.Providers.TestData</c></param>- /// <returns></returns>- public static async Task<string> GetEmbeddedFileContent(string filePath)- {- try- {- var assembly = Assembly.GetExecutingAssembly();- using Stream resourceStream = assembly.GetManifestResourceStream(filePath);- using StreamReader streamReader = new(resourceStream);- return await streamReader.ReadToEndAsync();- }- catch- {- throw new FileNotFoundException(filePath);- }- }-- /// <summary>- /// Retrieves the content of a file.- /// </summary>- /// <param name="filePath">Path to the file relative to <c>DevToys.Tests.Providers.TestData</c></param>- /// <returns></returns>- public static FileInfo GetFile(string filePath)- {- try- {- var assembly = Assembly.GetExecutingAssembly();- string assemblyDirectory = Path.GetDirectoryName(assembly.Location);- string resourcePath = Path.Combine(assemblyDirectory, filePath);- return new(resourcePath);- }- catch- {- throw new FileNotFoundException(filePath);- }- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Converters/CronParserCommandLineToolTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Converters/CronParserCommandLineToolTests.csdeleted file mode 100644index 76dcb64ed..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Converters/CronParserCommandLineToolTests.cs+++ /dev/null@@ -1,71 +0,0 @@-using System.IO;-using System.Threading.Tasks;-using DevToys.CLI;-using DevToys.Tools.Tools.Converters.Cron;-using Microsoft.Extensions.Logging;--namespace DevToys.UnitTests.Tools.Converters;--[Collection(nameof(TestParallelizationDisabled))]-public sealed class CronParserCommandLineToolTests : MefBasedTest-{- private readonly StringWriter _consoleWriter = new();- private readonly StringWriter _consoleErrorWriter = new();- private readonly CronParserCommandLineTool _tool;- private readonly Mock<ILogger> _loggerMock;-- public CronParserCommandLineToolTests()- : base(typeof(CronParserCommandLineTool).Assembly)- {- _tool = (CronParserCommandLineTool)MefProvider.ImportMany<ICommandLineTool, CommandLineToolMetadata>()- .Single(t => t.Metadata.InternalComponentName == "CronParser").Value;-- _loggerMock = new Mock<ILogger>();- Console.SetOut(_consoleWriter);- Console.SetError(_consoleErrorWriter);- }-- [Theory(DisplayName = "Invalid cron expression")]- [InlineData("*")]- [InlineData("* * * * * * * * *")]- public async Task InvalidCronExpression(string input)- {- _tool.CronExpression = input;-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(-1);- string consoleOutput = _consoleWriter.ToString().Trim();- consoleOutput.Should().Be("");- string consoleErrorOutput = _consoleErrorWriter.ToString().Trim();- consoleErrorOutput.Should().NotBe("");- }-- [Theory(DisplayName = "Invalid date format")]- [InlineData("hello")]- public async Task InvalidDateFormat(string input)- {- _tool.CronExpression = "* * * * *";- _tool.DateFormat = input;-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(-1);- string consoleOutput = _consoleWriter.ToString().Trim();- consoleOutput.Should().Be("");- string consoleErrorOutput = _consoleErrorWriter.ToString().Trim();- consoleErrorOutput.Should().NotBe("");- }-- [Theory(DisplayName = "Parse cron correctly")]- [InlineData("* * * * * *", true, "Every second")]- [InlineData("* * * * *", false, "Every minute")]- public async Task ParseCron(string input, bool includeSeconds, string expectedResult)- {- _tool.CronExpression = input;- _tool.IncludeSeconds = includeSeconds;-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(0);- string consoleOutput = _consoleWriter.ToString().Trim();- consoleOutput.Should().StartWith(expectedResult);- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Converters/CronParserGuiToolTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Converters/CronParserGuiToolTests.csdeleted file mode 100644index 613c17dd3..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Converters/CronParserGuiToolTests.cs+++ /dev/null@@ -1,64 +0,0 @@-using DevToys.Core.Tools.Metadata;-using DevToys.Tools.Tools.Converters.Cron;--namespace DevToys.UnitTests.Tools.Converters;--public sealed class CronParserGuiToolTests : MefBasedTest-{- private readonly ISettingsProvider _settingsProvider;- private readonly UIToolView _toolView;- private readonly CronParserGuiTool _tool;- private readonly IUISingleLineTextInput _dateFormatText;- private readonly IUISingleLineTextInput _cronExpressionText;- private readonly IUISingleLineTextInput _outputCronDescriptionText;- private readonly IUIInfoBar _infoBar;-- public CronParserGuiToolTests()- : base(typeof(CronParserGuiTool).Assembly)- {- _settingsProvider = MefProvider.Import<ISettingsProvider>();- _tool = (CronParserGuiTool)MefProvider.ImportMany<IGuiTool, GuiToolMetadata>()- .Single(t => t.Metadata.InternalComponentName == "CronParser")- .Value;-- _toolView = _tool.View;-- _dateFormatText = (IUISingleLineTextInput)_toolView.GetChildElementById("cron-parser-date-format");- _cronExpressionText = (IUISingleLineTextInput)_toolView.GetChildElementById("cron-parser-cron-expression");- _outputCronDescriptionText = (IUISingleLineTextInput)_toolView.GetChildElementById("cron-parser-output-description");- _infoBar = (IUIInfoBar)_toolView.GetChildElementById("cron-parser-info-bar");-- _settingsProvider.SetSetting(CronParserGuiTool.includeSeconds, true);- }-- [Theory(DisplayName = "Invalid cron expression")]- [InlineData("*")]- [InlineData("* * * * * * * * *")]- public void InvalidCronExpression(string input)- {- _infoBar.IsOpened.Should().BeFalse();- _cronExpressionText.Text(input);- _infoBar.IsOpened.Should().BeTrue();- }-- [Theory(DisplayName = "Invalid date format")]- [InlineData("hello")]- public void InvalidDateFormat(string input)- {- _infoBar.IsOpened.Should().BeFalse();- _dateFormatText.Text(input);- _infoBar.IsOpened.Should().BeTrue();- }-- [Theory(DisplayName = "Parse cron correctly")]- [InlineData("* * * * * *", true, "Every second")]- [InlineData("* * * * *", false, "Every minute")]- public void ParseCron(string input, bool includeSeconds, string expectedResult)- {- _settingsProvider.SetSetting(CronParserGuiTool.includeSeconds, includeSeconds);- _cronExpressionText.Text(input);-- _infoBar.IsOpened.Should().BeFalse();- _outputCronDescriptionText.Text.Should().Be(expectedResult);- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Converters/DateConverterCommandLineToolTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Converters/DateConverterCommandLineToolTests.csdeleted file mode 100644index be99af641..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Converters/DateConverterCommandLineToolTests.cs+++ /dev/null@@ -1,306 +0,0 @@-using System.IO;-using System.Threading.Tasks;-using CommunityToolkit.Mvvm.ComponentModel.__Internals;-using DevToys.CLI;-using DevToys.Tools.Models;-using DevToys.Tools.Tools.Converters.Date;-using Microsoft.Extensions.Logging;--namespace DevToys.UnitTests.Tools.Converters;--[Collection(nameof(TestParallelizationDisabled))]-public sealed class DateConverterCommandLineToolTests : MefBasedTest-{- private readonly StringWriter _consoleWriter = new();- private readonly StringWriter _consoleErrorWriter = new();- private readonly DateConverterCommandLineTool _tool;- private readonly Mock<ILogger> _loggerMock;-- public DateConverterCommandLineToolTests()- : base(typeof(DateConverterCommandLineTool).Assembly)- {- _tool = (DateConverterCommandLineTool)MefProvider.ImportMany<ICommandLineTool, CommandLineToolMetadata>()- .Single(t => t.Metadata.InternalComponentName == "DateConverter").Value;-- _loggerMock = new Mock<ILogger>();- Console.SetOut(_consoleWriter);- Console.SetError(_consoleErrorWriter);- }-- [Theory(DisplayName = "Convert with invalid input should return error exit code")]- [InlineData(null)]- [InlineData("")]- [InlineData(" ")]- public async Task ConvertJsonWithInvalidInputShouldReturnErrorExitCode(string input)- {- _tool.Input = input;- _tool.FormatOption = DateFormat.Seconds;-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(-1);- }-- #region DateTimeSeconds-- [Theory(DisplayName = "Convert valid dateTime with custom epoch and Seconds format should return valid timestamp to Seconds")]- [InlineData("1870-01-01T00:00:00.0000000Z", "1870-01-01T00:00:00.0000000Z", "Pacific Standard Time", 0)]- [InlineData("1923-11-23T19:58:07.0000000Z", "1870-01-01T00:00:00.0000000Z", "Pacific Standard Time", 1700683087)]- [InlineData("1800-11-22T19:58:07.0000000Z", "1870-01-01T00:00:00.0000000Z", "Pacific Standard Time", -2180836913)]- [InlineData("1870-01-01T00:00:00.0000000Z", "1870-01-01T00:00:00.0000000Z", "UTC", 0)]- [InlineData("1923-11-23T19:58:07.0000000Z", "1870-01-01T00:00:00.0000000Z", "UTC", 1700683087)]- [InlineData("1800-11-22T19:58:07.0000000Z", "1870-01-01T00:00:00.0000000Z", "UTC", -2180836913)]- public async Task ConvertValidDateTimeWithCustomEpochAndSecondsFormatShouldReturnValidTimestampInSeconds(- string dateTimeString,- string epochString,- string timeZoneString,- long exceptedTimestamp)- {- _tool.Input = dateTimeString;- _tool.EpochOption = epochString;- _tool.TimeZoneOption = timeZoneString;- _tool.FormatOption = DateFormat.Seconds;-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);-- result.Should().Be(0);-- string consoleOutput = _consoleWriter.ToString().Trim();- consoleOutput.Should().Be(exceptedTimestamp.ToString());- }-- [Theory(DisplayName = "Convert valid dateTime with unix epoch and Seconds format should return valid timestamp to Seconds")]- [InlineData("1970-01-01T00:00:00.0000000Z", "Pacific Standard Time", 0)]- [InlineData("2023-11-22T19:58:07.0000000Z", "Pacific Standard Time", 1700683087)]- [InlineData("1900-11-22T19:58:07.0000000Z", "Pacific Standard Time", -2180836913)]- [InlineData("1970-01-01T00:00:00.0000000Z", "UTC", 0)]- [InlineData("2023-11-22T19:58:07.0000000Z", "UTC", 1700683087)]- [InlineData("1900-11-22T19:58:07.0000000Z", "UTC", -2180836913)]- public async Task ConvertValidDateTimeWithUnixEpochAndSecondsFormatShouldReturnValidTimestampInSeconds(- string dateTimeString,- string timeZoneString,- long exceptedTimestamp)- {- _tool.Input = dateTimeString;- _tool.TimeZoneOption = timeZoneString;- _tool.FormatOption = DateFormat.Seconds;-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);-- result.Should().Be(0);-- string consoleOutput = _consoleWriter.ToString().Trim();- consoleOutput.Should().Be(exceptedTimestamp.ToString());- }-- #endregion-- #region TimestampSeconds-- [Theory(DisplayName = "Convert valid timestamp with custom epoch and Seconds format should return valid dateTime")]- [InlineData(0, "1870-01-01T00:00:00.0000000Z", "UTC", "1870-01-01T00:00:00.0000000+00:00")]- [InlineData(1700683087, "1870-01-01T00:00:00.0000000Z", "UTC", "1923-11-23T19:58:07.0000000+00:00")]- [InlineData(-2180836913, "1870-01-01T00:00:00.0000000Z", "UTC", "1800-11-22T19:58:07.0000000+00:00")]- [InlineData(0, "1870-01-01T00:00:00.0000000Z", "Pacific Standard Time", "1869-12-31T16:00:00.0000000-08:00")]- [InlineData(1700683087, "1870-01-01T00:00:00.0000000Z", "Pacific Standard Time", "1923-11-23T11:58:07.0000000-08:00")]- [InlineData(-2180836913, "1870-01-01T00:00:00.0000000Z", "Pacific Standard Time", "1800-11-22T11:58:07.0000000-08:00")]- public async Task ConvertValidTimestampWithCustomEpochAndSecondsFormatShouldReturnValidDateTime(- long timestamp,- string epochString,- string timeZoneString,- string exceptedDateTimeString)- {- _tool.Input = timestamp;- _tool.EpochOption = epochString;- _tool.TimeZoneOption = timeZoneString;- _tool.FormatOption = DateFormat.Seconds;-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);-- result.Should().Be(0);-- string consoleOutput = _consoleWriter.ToString().Trim();- consoleOutput.Should().Be(exceptedDateTimeString);- }-- [Theory(DisplayName = "Convert valid timestamp with unix epoch and Seconds format should return valid dateTime")]- [InlineData(0, "UTC", "1970-01-01T00:00:00.0000000+00:00")]- [InlineData(1700683087, "UTC", "2023-11-22T19:58:07.0000000+00:00")]- [InlineData(-2180836913, "UTC", "1900-11-22T19:58:07.0000000+00:00")]- [InlineData(0, "Pacific Standard Time", "1969-12-31T16:00:00.0000000-08:00")]- [InlineData(1700683087, "Pacific Standard Time", "2023-11-22T11:58:07.0000000-08:00")]- [InlineData(-2180836913, "Pacific Standard Time", "1900-11-22T11:58:07.0000000-08:00")]- public async Task ConvertValidTimestampWithUnixEpochAndSecondsFormatShouldReturnValidDateTime(- long timestamp,- string timeZoneString,- string exceptedDateTimeString)- {- _tool.Input = timestamp;- _tool.TimeZoneOption = timeZoneString;- _tool.FormatOption = DateFormat.Seconds;-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);-- result.Should().Be(0);-- string consoleOutput = _consoleWriter.ToString().Trim();- consoleOutput.Should().Be(exceptedDateTimeString);- }-- #endregion-- #region DateTimeMilliseconds-- [Theory(DisplayName = "Convert valid dateTime with custom epoch and Milliseconds format should return valid timestamp to Milliseconds")]- [InlineData("1870-01-01T00:00:00.0000000Z", "1870-01-01T00:00:00.0000000Z", "UTC", 0)]- [InlineData("1923-11-23T19:58:07.0000000Z", "1870-01-01T00:00:00.0000000Z", "UTC", 1700683087000)]- [InlineData("1800-11-22T19:58:07.0000000Z", "1870-01-01T00:00:00.0000000Z", "UTC", -2180836913000)]- [InlineData("1870-01-01T00:00:00.0000000Z", "1870-01-01T00:00:00.0000000Z", "Pacific Standard Time", 0)]- [InlineData("1923-11-23T19:58:07.0000000Z", "1870-01-01T00:00:00.0000000Z", "Pacific Standard Time", 1700683087000)]- [InlineData("1800-11-22T19:58:07.0000000Z", "1870-01-01T00:00:00.0000000Z", "Pacific Standard Time", -2180836913000)]- public async Task ConvertValidDateTimeWithCustomEpochAndMillisecondsFormatShouldReturnValidTimestampInMilliseconds(- string dateTimeString,- string epochString,- string timeZoneString,- long exceptedTimestamp)- {- _tool.Input = dateTimeString;- _tool.EpochOption = epochString;- _tool.TimeZoneOption = timeZoneString;- _tool.FormatOption = DateFormat.Milliseconds;-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);-- result.Should().Be(0);-- string consoleOutput = _consoleWriter.ToString().Trim();- consoleOutput.Should().Be(exceptedTimestamp.ToString());- }-- [Theory(DisplayName = "Convert valid dateTime with unix epoch and Milliseconds format should return valid timestamp to Milliseconds")]- [InlineData("1970-01-01T00:00:00.0000000Z", "UTC", 0)]- [InlineData("2023-11-22T19:58:07.0000000Z", "UTC", 1700683087000)]- [InlineData("1900-11-22T19:58:07.0000000Z", "UTC", -2180836913000)]- [InlineData("1970-01-01T00:00:00.0000000Z", "Pacific Standard Time", 0)]- [InlineData("2023-11-22T19:58:07.0000000Z", "Pacific Standard Time", 1700683087000)]- [InlineData("1900-11-22T19:58:07.0000000Z", "Pacific Standard Time", -2180836913000)]- public async Task ConvertValidDateTimeWithUnixEpochAndMillisecondsFormatShouldReturnValidTimestampInMilliseconds(- string dateTimeString,- string timeZoneString,- long exceptedTimestamp)- {- _tool.Input = dateTimeString;- _tool.TimeZoneOption = timeZoneString;- _tool.FormatOption = DateFormat.Milliseconds;-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);-- result.Should().Be(0);-- string consoleOutput = _consoleWriter.ToString().Trim();- consoleOutput.Should().Be(exceptedTimestamp.ToString());- }-- #endregion-- #region TimestampMilliseconds-- [Theory(DisplayName = "Convert valid timestamp with custom epoch and Milliseconds format should return valid dateTime")]- [InlineData(0, "1870-01-01T00:00:00.0000000Z", "UTC", "1870-01-01T00:00:00.0000000+00:00")]- [InlineData(1700683087000, "1870-01-01T00:00:00.0000000Z", "UTC", "1923-11-23T19:58:07.0000000+00:00")]- [InlineData(-2180836913000, "1870-01-01T00:00:00.0000000Z", "UTC", "1800-11-22T19:58:07.0000000+00:00")]- [InlineData(0, "1870-01-01T00:00:00.0000000Z", "Pacific Standard Time", "1869-12-31T16:00:00.0000000-08:00")]- [InlineData(1700683087000, "1870-01-01T00:00:00.0000000Z", "Pacific Standard Time", "1923-11-23T11:58:07.0000000-08:00")]- [InlineData(-2180836913000, "1870-01-01T00:00:00.0000000Z", "Pacific Standard Time", "1800-11-22T11:58:07.0000000-08:00")]- public async Task ConvertValidTimestampWithCustomEpochAndMillisecondsFormatShouldReturnValidDateTime(- long timestamp,- string epochString,- string timeZoneString,- string exceptedDateTimeString)- {- _tool.Input = timestamp;- _tool.EpochOption = epochString;- _tool.TimeZoneOption = timeZoneString;- _tool.FormatOption = DateFormat.Milliseconds;-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);-- result.Should().Be(0);-- string consoleOutput = _consoleWriter.ToString().Trim();- consoleOutput.Should().Be(exceptedDateTimeString);- }-- [Theory(DisplayName = "Convert valid timestamp with unix epoch and Milliseconds format should return valid dateTime")]- [InlineData(0, "UTC", "1970-01-01T00:00:00.0000000+00:00")]- [InlineData(1700683087000, "UTC", "2023-11-22T19:58:07.0000000+00:00")]- [InlineData(-2180836913000, "UTC", "1900-11-22T19:58:07.0000000+00:00")]- [InlineData(0, "Pacific Standard Time", "1969-12-31T16:00:00.0000000-08:00")]- [InlineData(1700683087000, "Pacific Standard Time", "2023-11-22T11:58:07.0000000-08:00")]- [InlineData(-2180836913000, "Pacific Standard Time", "1900-11-22T11:58:07.0000000-08:00")]- public async Task ConvertValidTimestampWithUnixEpochAndMillisecondsFormatShouldReturnValidDateTime(- long timestamp,- string timeZoneString,- string exceptedDateTimeString)- {- _tool.Input = timestamp;- _tool.TimeZoneOption = timeZoneString;- _tool.FormatOption = DateFormat.Milliseconds;-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);-- result.Should().Be(0);-- string consoleOutput = _consoleWriter.ToString().Trim();- consoleOutput.Should().Be(exceptedDateTimeString);- }-- #endregion-- [Theory(DisplayName = "Convert valid dateTime should return valid Ticks")]- [InlineData("1870-01-01T00:00:00.0000000Z", "UTC", 589799232000000000)]- [InlineData("1923-11-23T19:58:07.0000000Z", "UTC", 606806062870000000)]- [InlineData("1800-11-22T19:58:07.0000000Z", "UTC", 567990862870000000)]- [InlineData("1870-01-01T00:00:00.0000000Z", "Pacific Standard Time", 589799232000000000)]- [InlineData("1923-11-23T19:58:07.0000000Z", "Pacific Standard Time", 606806062870000000)]- [InlineData("1800-11-22T19:58:07.0000000Z", "Pacific Standard Time", 567990862870000000)]- public async Task ConvertValidDateTimeShouldReturnValidTicks(- string dateTimeString,- string timeZoneString,- long exceptedTimestamp)- {- _tool.Input = dateTimeString;- _tool.TimeZoneOption = timeZoneString;- _tool.FormatOption = DateFormat.Ticks;-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);-- result.Should().Be(0);-- string consoleOutput = _consoleWriter.ToString().Trim();- consoleOutput.Should().Be(exceptedTimestamp.ToString());- }-- [Theory(DisplayName = "Convert valid ticks should return valid dateTime")]- [InlineData(0, "UTC", "0001-01-01T00:00:00.0000000+00:00")]- [InlineData(638362798870000000, "UTC", "2023-11-22T19:58:07.0000000+00:00")]- [InlineData(599547598870000000, "UTC", "1900-11-22T19:58:07.0000000+00:00")]- [InlineData(0, "Pacific Standard Time", "0001-01-01T00:00:00.0000000+00:00")]- [InlineData(638362798870000000, "Pacific Standard Time", "2023-11-22T11:58:07.0000000-08:00")]- [InlineData(599547598870000000, "Pacific Standard Time", "1900-11-22T11:58:07.0000000-08:00")]- public async Task ConvertValidTicksWithTicksFormatShouldReturnValidDateTime(- long timestamp,- string timeZoneString,- string exceptedDateTimeString)- {- _tool.Input = timestamp;- _tool.TimeZoneOption = timeZoneString;- _tool.FormatOption = DateFormat.Ticks;-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);-- result.Should().Be(0);-- string consoleOutput = _consoleWriter.ToString().Trim();- consoleOutput.Should().Be(exceptedDateTimeString);- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Converters/DateConverterGuiToolTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Converters/DateConverterGuiToolTests.csdeleted file mode 100644index c3a056d23..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Converters/DateConverterGuiToolTests.cs+++ /dev/null@@ -1,519 +0,0 @@-using System.Globalization;-using System.Threading.Tasks;-using DevToys.Core.Tools.Metadata;-using DevToys.Tools.Models;-using DevToys.Tools.Tools.Converters.Date;--namespace DevToys.UnitTests.Tools.Converters;--public class DateConverterGuiToolTests : MefBasedTest-{- private const string ToolName = "DateConverter";- private const string NumberInputText = "date-converter-number-input";- private const string SelectTimeZoneList = "date-converter-timezone-dropdown";-- #region Settings- private const string DateFormatSetting = "date-converter-format-setting";- #endregion-- #region EpochUiInputs- private const string UseCustomEpochSwitch = "date-converter-use-custom-epoch-switch";- private const string EpochYearInputNumber = "date-converter-epoch-input-year";- private const string EpochMonthInputNumber = "date-converter-epoch-input-month";- private const string EpochDayInputNumber = "date-converter-epoch-input-day";- private const string EpochHourInputNumber = "date-converter-epoch-input-hour";- private const string EpochMinuteInputNumber = "date-converter-epoch-input-minute";- private const string EpochSecondsInputNumber = "date-converter-epoch-input-second";- private const string EpochMillisecondsInputNumber = "date-converter-epoch-input-millisecond";- #endregion-- #region DateTimeUiInputs- private const string DateYearInputNumber = "date-converter-input-time-year";- private const string DateMonthInputNumber = "date-converter-input-time-month";- private const string DateDayInputNumber = "date-converter-input-time-day";- private const string DateHourInputNumber = "date-converter-input-time-hour";- private const string DateMinuteInputNumber = "date-converter-input-time-minute";- private const string DateSecondsInputNumber = "date-converter-input-time-second";- private const string DateMillisecondsInputNumber = "date-converter-input-time-millisecond";- #endregion-- public DateConverterGuiToolTests()- : base(typeof(DateConverterGuiTool).Assembly)- { }-- #region DateTimeSeconds-- [Theory(DisplayName = "Convert valid dateTime with custom epoch and Seconds format should return valid timestamp to Seconds")]- [InlineData("1870-01-01T00:00:00.0000000Z", "1870-01-01T00:00:00.0000000Z", "UTC", 0)]- [InlineData("1923-11-23T19:58:07.0000000Z", "1870-01-01T00:00:00.0000000Z", "UTC", 1700683087)]- [InlineData("1800-11-22T19:58:07.0000000Z", "1870-01-01T00:00:00.0000000Z", "UTC", -2180836913)]- [InlineData("1870-01-01T00:00:00.0000000Z", "1870-01-01T00:00:00.0000000Z", "Pacific Standard Time", 28800)]- [InlineData("1923-11-23T19:58:07.0000000Z", "1870-01-01T00:00:00.0000000Z", "Pacific Standard Time", 1700711887)]- [InlineData("1800-11-22T19:58:07.0000000Z", "1870-01-01T00:00:00.0000000Z", "Pacific Standard Time", -2180808113)]- public async Task ConvertValidDateTimeWithCustomEpochAndSecondsFormatShouldReturnValidTimestampInSeconds(- string dateTimeString,- string epochString,- string timeZoneString,- long exceptedTimestamp)- {- var date = DateTimeOffset.Parse(dateTimeString, CultureInfo.InvariantCulture);- var epoch = DateTimeOffset.Parse(epochString, CultureInfo.InvariantCulture);-- DateConverterGuiTool tool = GetToolInstance<DateConverterGuiTool>(MefProvider, ToolName);- IUISwitch epochSettings = GetGUIElementById<IUISwitch>(tool.View, UseCustomEpochSwitch);- IUISelectDropDownList timeZoneDropDownList = GetGUIElementById<IUISelectDropDownList>(tool.View, SelectTimeZoneList);- IUISetting formatSetting = GetGUIElementById<IUISetting>(tool.View, DateFormatSetting);- var formatDropdownList = formatSetting.InteractiveElement as IUISelectDropDownList;-- epochSettings.On();-- int timezoneIndex = Array.FindIndex(timeZoneDropDownList.Items, w => w.Value.Equals(timeZoneString));- timeZoneDropDownList.Select(timezoneIndex);-- int formatIndex = Array.FindIndex(formatDropdownList.Items, w => w.Value.Equals(DateFormat.Seconds));- formatDropdownList.Select(formatIndex);-- GetGUIElementById<IUINumberInput>(tool.View, EpochYearInputNumber).Text(epoch.Year.ToString());- GetGUIElementById<IUINumberInput>(tool.View, EpochMonthInputNumber).Text(epoch.Month.ToString());- GetGUIElementById<IUINumberInput>(tool.View, EpochDayInputNumber).Text(epoch.Day.ToString());- GetGUIElementById<IUINumberInput>(tool.View, EpochHourInputNumber).Text(epoch.Hour.ToString());- GetGUIElementById<IUINumberInput>(tool.View, EpochMinuteInputNumber).Text(epoch.Minute.ToString());- GetGUIElementById<IUINumberInput>(tool.View, EpochSecondsInputNumber).Text(epoch.Second.ToString());- GetGUIElementById<IUINumberInput>(tool.View, EpochMillisecondsInputNumber).Text(epoch.Millisecond.ToString());-- GetGUIElementById<IUINumberInput>(tool.View, DateYearInputNumber).Text(date.Year.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateMonthInputNumber).Text(date.Month.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateDayInputNumber).Text(date.Day.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateHourInputNumber).Text(date.Hour.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateMinuteInputNumber).Text(date.Minute.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateSecondsInputNumber).Text(date.Second.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateMillisecondsInputNumber).Value(0);-- await tool.WorkTask;-- GetGUIElementById<IUINumberInput>(tool.View, NumberInputText).Text.Should().Be(exceptedTimestamp.ToString());- }-- [Theory(DisplayName = "Convert valid dateTime with unix epoch and Seconds format should return valid timestamp to Seconds")]- [InlineData("1970-01-01T00:00:00.0000000Z", "UTC", 0)]- [InlineData("2023-11-22T19:58:07.0000000Z", "UTC", 1700683087)]- [InlineData("1900-11-22T19:58:07.0000000Z", "UTC", -2180836913)]- [InlineData("1970-01-01T00:00:00.0000000Z", "Pacific Standard Time", 28800)]- [InlineData("2023-11-22T19:58:07.0000000Z", "Pacific Standard Time", 1700711887)]- [InlineData("1900-11-22T19:58:07.0000000Z", "Pacific Standard Time", -2180808113)]- public async Task ConvertValidDateTimeWithUnixEpochAndSecondsFormatShouldReturnValidTimestampInSeconds(- string dateTimeString,- string timeZoneString,- long exceptedTimestamp)- {- var date = DateTimeOffset.Parse(dateTimeString, CultureInfo.InvariantCulture);-- DateConverterGuiTool tool = GetToolInstance<DateConverterGuiTool>(MefProvider, ToolName);- IUISwitch epochSettings = GetGUIElementById<IUISwitch>(tool.View, UseCustomEpochSwitch);- IUISelectDropDownList timeZoneDropDownList = GetGUIElementById<IUISelectDropDownList>(tool.View, SelectTimeZoneList);- IUISetting formatSetting = GetGUIElementById<IUISetting>(tool.View, DateFormatSetting);- var formatDropdownList = formatSetting.InteractiveElement as IUISelectDropDownList;-- epochSettings.Off();-- int timezoneIndex = Array.FindIndex(timeZoneDropDownList.Items, w => w.Value.Equals(timeZoneString));- timeZoneDropDownList.Select(timezoneIndex);-- int formatIndex = Array.FindIndex(formatDropdownList.Items, w => w.Value.Equals(DateFormat.Seconds));- formatDropdownList.Select(formatIndex);-- GetGUIElementById<IUINumberInput>(tool.View, DateYearInputNumber).Text(date.Year.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateMonthInputNumber).Text(date.Month.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateDayInputNumber).Text(date.Day.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateHourInputNumber).Text(date.Hour.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateMinuteInputNumber).Text(date.Minute.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateSecondsInputNumber).Text(date.Second.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateMillisecondsInputNumber).Value(0);-- await tool.WorkTask;-- GetGUIElementById<IUINumberInput>(tool.View, NumberInputText).Text.Should().Be(exceptedTimestamp.ToString());- }-- #endregion-- #region TimestampSeconds-- [Theory(DisplayName = "Convert valid timestamp with custom epoch and Seconds format should return valid dateTime")]- [InlineData(0, "1870-01-01T00:00:00.0000000Z", "UTC", "1870-01-01T00:00:00.0000000Z")]- [InlineData(1700683087, "1870-01-01T00:00:00.0000000Z", "UTC", "1923-11-23T19:58:07.0000000Z")]- [InlineData(-2180836913, "1870-01-01T00:00:00.0000000Z", "UTC", "1800-11-22T19:58:07.0000000Z")]- [InlineData(0, "1870-01-01T00:00:00.0000000Z", "Pacific Standard Time", "1869-12-31T16:00:00.0000000Z")]- [InlineData(1700683087, "1870-01-01T00:00:00.0000000Z", "Pacific Standard Time", "1923-11-23T11:58:07.0000000Z")]- [InlineData(-2180836913, "1870-01-01T00:00:00.0000000Z", "Pacific Standard Time", "1800-11-22T11:58:07.0000000Z")]- public async Task ConvertValidTimestampWithCustomEpochAndSecondsFormatShouldReturnValidDateTime(- long timestamp,- string epochString,- string timeZoneString,- string exceptedDateTimeString)- {- var expectedDate = DateTimeOffset.Parse(exceptedDateTimeString, CultureInfo.InvariantCulture);- var epoch = DateTimeOffset.Parse(epochString, CultureInfo.InvariantCulture);-- DateConverterGuiTool tool = GetToolInstance<DateConverterGuiTool>(MefProvider, ToolName);- IUISwitch epochSettings = GetGUIElementById<IUISwitch>(tool.View, UseCustomEpochSwitch);- IUISelectDropDownList timeZoneDropDownList = GetGUIElementById<IUISelectDropDownList>(tool.View, SelectTimeZoneList);- IUISetting formatSetting = GetGUIElementById<IUISetting>(tool.View, DateFormatSetting);- var formatDropdownList = formatSetting.InteractiveElement as IUISelectDropDownList;-- epochSettings.On();-- int timezoneIndex = Array.FindIndex(timeZoneDropDownList.Items, w => w.Value.Equals(timeZoneString));- timeZoneDropDownList.Select(timezoneIndex);-- int formatIndex = Array.FindIndex(formatDropdownList.Items, w => w.Value.Equals(DateFormat.Seconds));- formatDropdownList.Select(formatIndex);-- GetGUIElementById<IUINumberInput>(tool.View, EpochYearInputNumber).Text(epoch.Year.ToString());- GetGUIElementById<IUINumberInput>(tool.View, EpochMonthInputNumber).Text(epoch.Month.ToString());- GetGUIElementById<IUINumberInput>(tool.View, EpochDayInputNumber).Text(epoch.Day.ToString());- GetGUIElementById<IUINumberInput>(tool.View, EpochHourInputNumber).Text(epoch.Hour.ToString());- GetGUIElementById<IUINumberInput>(tool.View, EpochMinuteInputNumber).Text(epoch.Minute.ToString());- GetGUIElementById<IUINumberInput>(tool.View, EpochSecondsInputNumber).Text(epoch.Second.ToString());- GetGUIElementById<IUINumberInput>(tool.View, EpochMillisecondsInputNumber).Text(epoch.Millisecond.ToString());-- GetGUIElementById<IUINumberInput>(tool.View, NumberInputText).Text(timestamp.ToString());-- await tool.WorkTask;-- GetGUIElementById<IUINumberInput>(tool.View, DateYearInputNumber).Text.Should().Be(expectedDate.Year.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateMonthInputNumber).Text.Should().Be(expectedDate.Month.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateDayInputNumber).Text.Should().Be(expectedDate.Day.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateHourInputNumber).Text.Should().Be(expectedDate.Hour.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateMinuteInputNumber).Text.Should().Be(expectedDate.Minute.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateSecondsInputNumber).Text.Should().Be(expectedDate.Second.ToString());- }-- [Theory(DisplayName = "Convert valid timestamp with unix epoch and Seconds format should return valid dateTime")]- [InlineData(0, "UTC", "1970-01-01T00:00:00.0000000Z")]- [InlineData(1700683087, "UTC", "2023-11-22T19:58:07.0000000Z")]- [InlineData(-2180836913, "UTC", "1900-11-22T19:58:07.0000000Z")]- [InlineData(0, "Pacific Standard Time", "1969-12-31T16:00:00.0000000Z")]- [InlineData(1700683087, "Pacific Standard Time", "2023-11-22T11:58:07.0000000Z")]- [InlineData(-2180836913, "Pacific Standard Time", "1900-11-22T11:58:07.0000000Z")]- public async Task ConvertValidTimestampWithUnixEpochAndSecondsFormatShouldReturnValidDateTime(- long timestamp,- string timeZoneString,- string exceptedDateTimeString)- {- var expectedDate = DateTimeOffset.Parse(exceptedDateTimeString, CultureInfo.InvariantCulture);-- DateConverterGuiTool tool = GetToolInstance<DateConverterGuiTool>(MefProvider, ToolName);- IUISwitch epochSettings = GetGUIElementById<IUISwitch>(tool.View, UseCustomEpochSwitch);- IUISelectDropDownList timeZoneDropDownList = GetGUIElementById<IUISelectDropDownList>(tool.View, SelectTimeZoneList);- IUISetting formatSetting = GetGUIElementById<IUISetting>(tool.View, DateFormatSetting);- var formatDropdownList = formatSetting.InteractiveElement as IUISelectDropDownList;-- epochSettings.Off();-- int timezoneIndex = Array.FindIndex(timeZoneDropDownList.Items, w => w.Value.Equals(timeZoneString));- timeZoneDropDownList.Select(timezoneIndex);-- int formatIndex = Array.FindIndex(formatDropdownList.Items, w => w.Value.Equals(DateFormat.Seconds));- formatDropdownList.Select(formatIndex);-- GetGUIElementById<IUINumberInput>(tool.View, NumberInputText).Text(timestamp.ToString());-- await tool.WorkTask;-- GetGUIElementById<IUINumberInput>(tool.View, DateYearInputNumber).Text.Should().Be(expectedDate.Year.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateMonthInputNumber).Text.Should().Be(expectedDate.Month.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateDayInputNumber).Text.Should().Be(expectedDate.Day.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateHourInputNumber).Text.Should().Be(expectedDate.Hour.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateMinuteInputNumber).Text.Should().Be(expectedDate.Minute.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateSecondsInputNumber).Text.Should().Be(expectedDate.Second.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateMillisecondsInputNumber).Value.Should().Be(0);- }-- #endregion-- #region DateTimeMilliseconds-- [Theory(DisplayName = "Convert valid dateTime with custom epoch and Milliseconds format should return valid timestamp to Milliseconds")]- [InlineData("1870-01-01T00:00:00.0000000Z", "1870-01-01T00:00:00.0000000Z", "UTC", 0)]- [InlineData("1923-11-23T19:58:07.0000000Z", "1870-01-01T00:00:00.0000000Z", "UTC", 1700683087000)]- [InlineData("1800-11-22T19:58:07.0000000Z", "1870-01-01T00:00:00.0000000Z", "UTC", -2180836913000)]- [InlineData("1870-01-01T00:00:00.0000000Z", "1870-01-01T00:00:00.0000000Z", "Pacific Standard Time", 28800000)]- [InlineData("1923-11-23T19:58:07.0000000Z", "1870-01-01T00:00:00.0000000Z", "Pacific Standard Time", 1700711887000)]- [InlineData("1800-11-22T19:58:07.0000000Z", "1870-01-01T00:00:00.0000000Z", "Pacific Standard Time", -2180808113000)]- public async Task ConvertValidDateTimeWithCustomEpochAndMillisecondsFormatShouldReturnValidTimestampInMilliseconds(- string dateTimeString,- string epochString,- string timeZoneString,- long exceptedTimestamp)- {- var date = DateTimeOffset.Parse(dateTimeString, CultureInfo.InvariantCulture);- var epoch = DateTimeOffset.Parse(epochString, CultureInfo.InvariantCulture);-- DateConverterGuiTool tool = GetToolInstance<DateConverterGuiTool>(MefProvider, ToolName);- IUISwitch epochSettings = GetGUIElementById<IUISwitch>(tool.View, UseCustomEpochSwitch);- IUISelectDropDownList timeZoneDropDownList = GetGUIElementById<IUISelectDropDownList>(tool.View, SelectTimeZoneList);- IUISetting formatSetting = GetGUIElementById<IUISetting>(tool.View, DateFormatSetting);- var formatDropdownList = formatSetting.InteractiveElement as IUISelectDropDownList;-- epochSettings.On();-- int timezoneIndex = Array.FindIndex(timeZoneDropDownList.Items, w => w.Value.Equals(timeZoneString));- timeZoneDropDownList.Select(timezoneIndex);-- int formatIndex = Array.FindIndex(formatDropdownList.Items, w => w.Value.Equals(DateFormat.Milliseconds));- formatDropdownList.Select(formatIndex);-- GetGUIElementById<IUINumberInput>(tool.View, EpochYearInputNumber).Text(epoch.Year.ToString());- GetGUIElementById<IUINumberInput>(tool.View, EpochMonthInputNumber).Text(epoch.Month.ToString());- GetGUIElementById<IUINumberInput>(tool.View, EpochDayInputNumber).Text(epoch.Day.ToString());- GetGUIElementById<IUINumberInput>(tool.View, EpochHourInputNumber).Text(epoch.Hour.ToString());- GetGUIElementById<IUINumberInput>(tool.View, EpochMinuteInputNumber).Text(epoch.Minute.ToString());- GetGUIElementById<IUINumberInput>(tool.View, EpochSecondsInputNumber).Text(epoch.Second.ToString());- GetGUIElementById<IUINumberInput>(tool.View, EpochMillisecondsInputNumber).Text(epoch.Millisecond.ToString());-- GetGUIElementById<IUINumberInput>(tool.View, DateYearInputNumber).Text(date.Year.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateMonthInputNumber).Text(date.Month.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateDayInputNumber).Text(date.Day.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateHourInputNumber).Text(date.Hour.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateMinuteInputNumber).Text(date.Minute.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateSecondsInputNumber).Text(date.Second.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateMillisecondsInputNumber).Text(date.Millisecond.ToString());-- await tool.WorkTask;-- GetGUIElementById<IUINumberInput>(tool.View, NumberInputText).Text.Should().Be(exceptedTimestamp.ToString());- }-- [Theory(DisplayName = "Convert valid dateTime with unix epoch and Milliseconds format should return valid timestamp to Milliseconds")]- [InlineData("1970-01-01T00:00:00.0000000Z", "UTC", 0)]- [InlineData("2023-11-22T19:58:07.0000000Z", "UTC", 1700683087000)]- [InlineData("1900-11-22T19:58:07.0000000Z", "UTC", -2180836913000)]- [InlineData("1970-01-01T00:00:00.0000000Z", "Pacific Standard Time", 28800000)]- [InlineData("2023-11-22T19:58:07.0000000Z", "Pacific Standard Time", 1700711887000)]- [InlineData("1900-11-22T19:58:07.0000000Z", "Pacific Standard Time", -2180808113000)]- public async Task ConvertValidDateTimeWithUnixEpochAndMillisecondsFormatShouldReturnValidTimestampInMilliseconds(- string dateTimeString,- string timeZoneString,- long exceptedTimestamp)- {- var date = DateTimeOffset.Parse(dateTimeString, CultureInfo.InvariantCulture);-- DateConverterGuiTool tool = GetToolInstance<DateConverterGuiTool>(MefProvider, ToolName);- IUISwitch epochSettings = GetGUIElementById<IUISwitch>(tool.View, UseCustomEpochSwitch);- IUISelectDropDownList timeZoneDropDownList = GetGUIElementById<IUISelectDropDownList>(tool.View, SelectTimeZoneList);- IUISetting formatSetting = GetGUIElementById<IUISetting>(tool.View, DateFormatSetting);- var formatDropdownList = formatSetting.InteractiveElement as IUISelectDropDownList;-- epochSettings.Off();-- int timezoneIndex = Array.FindIndex(timeZoneDropDownList.Items, w => w.Value.Equals(timeZoneString));- timeZoneDropDownList.Select(timezoneIndex);-- int formatIndex = Array.FindIndex(formatDropdownList.Items, w => w.Value.Equals(DateFormat.Milliseconds));- formatDropdownList.Select(formatIndex);-- GetGUIElementById<IUINumberInput>(tool.View, DateYearInputNumber).Text(date.Year.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateMonthInputNumber).Text(date.Month.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateDayInputNumber).Text(date.Day.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateHourInputNumber).Text(date.Hour.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateMinuteInputNumber).Text(date.Minute.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateSecondsInputNumber).Text(date.Second.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateMillisecondsInputNumber).Value(0);-- await tool.WorkTask;-- GetGUIElementById<IUINumberInput>(tool.View, NumberInputText).Text.Should().Be(exceptedTimestamp.ToString());- }-- #endregion-- #region TimestampMilliseconds-- [Theory(DisplayName = "Convert valid timestamp with custom epoch and Milliseconds format should return valid dateTime")]- [InlineData(0, "1870-01-01T00:00:00.0000000Z", "UTC", "1870-01-01T00:00:00.0000000Z")]- [InlineData(1700683087000, "1870-01-01T00:00:00.0000000Z", "UTC", "1923-11-23T19:58:07.0000000Z")]- [InlineData(-2180836913000, "1870-01-01T00:00:00.0000000Z", "UTC", "1800-11-22T19:58:07.0000000Z")]- [InlineData(0, "1870-01-01T00:00:00.0000000Z", "Pacific Standard Time", "1869-12-31T16:00:00.0000000Z")]- [InlineData(1700683087000, "1870-01-01T00:00:00.0000000Z", "Pacific Standard Time", "1923-11-23T11:58:07.0000000Z")]- [InlineData(-2180836913000, "1870-01-01T00:00:00.0000000Z", "Pacific Standard Time", "1800-11-22T11:58:07.0000000Z")]- public async Task ConvertValidTimestampWithCustomEpochAndMillisecondsFormatShouldReturnValidDateTime(- long timestamp,- string epochString,- string timeZoneString,- string exceptedDateTimeString)- {- var expectedDate = DateTimeOffset.Parse(exceptedDateTimeString, CultureInfo.InvariantCulture);- var epoch = DateTimeOffset.Parse(epochString, CultureInfo.InvariantCulture);-- DateConverterGuiTool tool = GetToolInstance<DateConverterGuiTool>(MefProvider, ToolName);- IUISwitch epochSettings = GetGUIElementById<IUISwitch>(tool.View, UseCustomEpochSwitch);- IUISelectDropDownList timeZoneDropDownList = GetGUIElementById<IUISelectDropDownList>(tool.View, SelectTimeZoneList);- IUISetting formatSetting = GetGUIElementById<IUISetting>(tool.View, DateFormatSetting);- var formatDropdownList = formatSetting.InteractiveElement as IUISelectDropDownList;-- epochSettings.On();-- int timezoneIndex = Array.FindIndex(timeZoneDropDownList.Items, w => w.Value.Equals(timeZoneString));- timeZoneDropDownList.Select(timezoneIndex);-- int formatIndex = Array.FindIndex(formatDropdownList.Items, w => w.Value.Equals(DateFormat.Milliseconds));- formatDropdownList.Select(formatIndex);-- GetGUIElementById<IUINumberInput>(tool.View, EpochYearInputNumber).Text(epoch.Year.ToString());- GetGUIElementById<IUINumberInput>(tool.View, EpochMonthInputNumber).Text(epoch.Month.ToString());- GetGUIElementById<IUINumberInput>(tool.View, EpochDayInputNumber).Text(epoch.Day.ToString());- GetGUIElementById<IUINumberInput>(tool.View, EpochHourInputNumber).Text(epoch.Hour.ToString());- GetGUIElementById<IUINumberInput>(tool.View, EpochMinuteInputNumber).Text(epoch.Minute.ToString());- GetGUIElementById<IUINumberInput>(tool.View, EpochSecondsInputNumber).Text(epoch.Second.ToString());- GetGUIElementById<IUINumberInput>(tool.View, EpochMillisecondsInputNumber).Text(epoch.Millisecond.ToString());-- GetGUIElementById<IUINumberInput>(tool.View, NumberInputText).Text(timestamp.ToString());-- await tool.WorkTask;-- GetGUIElementById<IUINumberInput>(tool.View, DateYearInputNumber).Text.Should().Be(expectedDate.Year.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateMonthInputNumber).Text.Should().Be(expectedDate.Month.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateDayInputNumber).Text.Should().Be(expectedDate.Day.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateHourInputNumber).Text.Should().Be(expectedDate.Hour.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateMinuteInputNumber).Text.Should().Be(expectedDate.Minute.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateSecondsInputNumber).Text.Should().Be(expectedDate.Second.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateMillisecondsInputNumber).Text.Should().Be(expectedDate.Millisecond.ToString());- }-- [Theory(DisplayName = "Convert valid timestamp with unix epoch and Milliseconds format should return valid dateTime")]- [InlineData(0, "UTC", "1970-01-01T00:00:00.0000000Z")]- [InlineData(1700683087000, "UTC", "2023-11-22T19:58:07.0000000Z")]- [InlineData(-2180836913000, "UTC", "1900-11-22T19:58:07.0000000Z")]- [InlineData(0, "Pacific Standard Time", "1969-12-31T16:00:00.0000000Z")]- [InlineData(1700683087000, "Pacific Standard Time", "2023-11-22T11:58:07.0000000Z")]- [InlineData(-2180836913000, "Pacific Standard Time", "1900-11-22T11:58:07.0000000Z")]- public async Task ConvertValidTimestampWithUnixEpochAndMillisecondsFormatShouldReturnValidDateTime(- long timestamp,- string timeZoneString,- string exceptedDateTimeString)- {- var expectedDate = DateTimeOffset.Parse(exceptedDateTimeString, CultureInfo.InvariantCulture);-- DateConverterGuiTool tool = GetToolInstance<DateConverterGuiTool>(MefProvider, ToolName);- IUISwitch epochSettings = GetGUIElementById<IUISwitch>(tool.View, UseCustomEpochSwitch);- IUISelectDropDownList timeZoneDropDownList = GetGUIElementById<IUISelectDropDownList>(tool.View, SelectTimeZoneList);- IUISetting formatSetting = GetGUIElementById<IUISetting>(tool.View, DateFormatSetting);- var formatDropdownList = formatSetting.InteractiveElement as IUISelectDropDownList;-- epochSettings.Off();-- int timezoneIndex = Array.FindIndex(timeZoneDropDownList.Items, w => w.Value.Equals(timeZoneString));- timeZoneDropDownList.Select(timezoneIndex);-- int formatIndex = Array.FindIndex(formatDropdownList.Items, w => w.Value.Equals(DateFormat.Milliseconds));- formatDropdownList.Select(formatIndex);-- GetGUIElementById<IUINumberInput>(tool.View, NumberInputText).Text(timestamp.ToString());-- await tool.WorkTask;-- GetGUIElementById<IUINumberInput>(tool.View, DateYearInputNumber).Text.Should().Be(expectedDate.Year.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateMonthInputNumber).Text.Should().Be(expectedDate.Month.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateDayInputNumber).Text.Should().Be(expectedDate.Day.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateHourInputNumber).Text.Should().Be(expectedDate.Hour.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateMinuteInputNumber).Text.Should().Be(expectedDate.Minute.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateSecondsInputNumber).Text.Should().Be(expectedDate.Second.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateMillisecondsInputNumber).Text.Should().Be(expectedDate.Millisecond.ToString());- }-- #endregion-- [Theory(DisplayName = "Convert valid dateTime should return valid Ticks")]- [InlineData("1870-01-01T00:00:00.0000000+00:00", "UTC", 589799232000000000)]- [InlineData("1923-11-23T19:58:07.0000000+00:00", "UTC", 606806062870000000)]- [InlineData("1800-11-22T19:58:07.0000000+00:00", "UTC", 567990862870000000)]- [InlineData("1870-01-01T00:00:00.0000000-08:00", "Pacific Standard Time", 589799520000000000)]- [InlineData("1870-01-01T00:00:00.0000000+00:00", "Pacific Standard Time", 589799520000000000)]- [InlineData("1923-11-23T19:58:07.0000000Z", "Pacific Standard Time", 606806350870000000)]- [InlineData("1800-11-22T19:58:07.0000000Z", "Pacific Standard Time", 567991150870000000)]- public async Task ConvertValidDateTimeShouldReturnValidTicks(- string dateTimeString,- string timeZoneString,- long exceptedTicks)- {- var date = DateTimeOffset.Parse(dateTimeString, CultureInfo.InvariantCulture);-- DateConverterGuiTool tool = GetToolInstance<DateConverterGuiTool>(MefProvider, ToolName);- IUISwitch epochSettings = GetGUIElementById<IUISwitch>(tool.View, UseCustomEpochSwitch);- IUISelectDropDownList timeZoneDropDownList = GetGUIElementById<IUISelectDropDownList>(tool.View, SelectTimeZoneList);- IUISetting formatSetting = GetGUIElementById<IUISetting>(tool.View, DateFormatSetting);- var formatDropdownList = formatSetting.InteractiveElement as IUISelectDropDownList;-- epochSettings.Off();-- int timezoneIndex = Array.FindIndex(timeZoneDropDownList.Items, w => w.Value.Equals(timeZoneString));- timeZoneDropDownList.Select(timezoneIndex);-- int formatIndex = Array.FindIndex(formatDropdownList.Items, w => w.Value.Equals(DateFormat.Ticks));- formatDropdownList.Select(formatIndex);-- GetGUIElementById<IUINumberInput>(tool.View, DateYearInputNumber).Text(date.Year.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateMonthInputNumber).Text(date.Month.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateDayInputNumber).Text(date.Day.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateHourInputNumber).Text(date.Hour.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateMinuteInputNumber).Text(date.Minute.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateSecondsInputNumber).Text(date.Second.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateMillisecondsInputNumber).Value(0);-- await tool.WorkTask;-- GetGUIElementById<IUINumberInput>(tool.View, NumberInputText).Text.Should().Be(exceptedTicks.ToString());- }-- [Theory(DisplayName = "Convert valid ticks should return valid dateTime")]- [InlineData(0, "UTC", "0001-01-01T00:00:00.0000000Z")]- [InlineData(638362798870000000, "UTC", "2023-11-22T19:58:07.0000000Z")]- [InlineData(599547598870000000, "UTC", "1900-11-22T19:58:07.0000000Z")]- [InlineData(0, "Pacific Standard Time", "0001-01-01T00:00:00.0000000Z")]- [InlineData(638362798870000000, "Pacific Standard Time", "2023-11-22T11:58:07.0000000Z")]- [InlineData(599547598870000000, "Pacific Standard Time", "1900-11-22T11:58:07.0000000Z")]- public async Task ConvertValidTicksWithTicksFormatShouldReturnValidDateTime(- long ticks,- string timeZoneString,- string exceptedDateTimeString)- {- var expectedDate = DateTimeOffset.Parse(exceptedDateTimeString, CultureInfo.InvariantCulture);-- DateConverterGuiTool tool = GetToolInstance<DateConverterGuiTool>(MefProvider, ToolName);- IUISwitch epochSettings = GetGUIElementById<IUISwitch>(tool.View, UseCustomEpochSwitch);- IUISelectDropDownList timeZoneDropDownList = GetGUIElementById<IUISelectDropDownList>(tool.View, SelectTimeZoneList);- IUISetting formatSetting = GetGUIElementById<IUISetting>(tool.View, DateFormatSetting);- var formatDropdownList = formatSetting.InteractiveElement as IUISelectDropDownList;-- epochSettings.Off();-- int timezoneIndex = Array.FindIndex(timeZoneDropDownList.Items, w => w.Value.Equals(timeZoneString));- timeZoneDropDownList.Select(timezoneIndex);-- int formatIndex = Array.FindIndex(formatDropdownList.Items, w => w.Value.Equals(DateFormat.Ticks));- formatDropdownList.Select(formatIndex);-- GetGUIElementById<IUINumberInput>(tool.View, NumberInputText).Text(ticks.ToString());-- await tool.WorkTask;-- GetGUIElementById<IUINumberInput>(tool.View, DateYearInputNumber).Text.Should().Be(expectedDate.Year.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateMonthInputNumber).Text.Should().Be(expectedDate.Month.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateDayInputNumber).Text.Should().Be(expectedDate.Day.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateHourInputNumber).Text.Should().Be(expectedDate.Hour.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateMinuteInputNumber).Text.Should().Be(expectedDate.Minute.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateSecondsInputNumber).Text.Should().Be(expectedDate.Second.ToString());- GetGUIElementById<IUINumberInput>(tool.View, DateMillisecondsInputNumber).Text.Should().Be(expectedDate.Millisecond.ToString());- }-- private static T GetGUIElementById<T>(UIToolView toolView, string name)- => (T)toolView.GetChildElementById(name);-- private static T GetToolInstance<T>(IMefProvider mefProvider, string name)- where T : IGuiTool- => (T)mefProvider.ImportMany<IGuiTool, GuiToolMetadata>()- .Single(t => t.Metadata.InternalComponentName == name)- .Value;--}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Converters/JsonYamlConverterCommandLineToolTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Converters/JsonYamlConverterCommandLineToolTests.csdeleted file mode 100644index ae729d41f..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Converters/JsonYamlConverterCommandLineToolTests.cs+++ /dev/null@@ -1,233 +0,0 @@-using System.IO;-using System.Threading.Tasks;-using DevToys.CLI;-using DevToys.Tools.Models;-using DevToys.Tools.Tools.Converters.JsonYaml;-using DevToys.UnitTests.Mocks;-using Microsoft.Extensions.Logging;--namespace DevToys.UnitTests.Tools.Converters;--[Collection(nameof(TestParallelizationDisabled))]-public sealed class JsonYamlConverterCommandLineToolTests : MefBasedTest-{- private readonly StringWriter _consoleWriter = new();- private readonly StringWriter _consoleErrorWriter = new();- private readonly JsonYamlConverterCommandLineTool _tool;- private readonly Mock<ILogger> _loggerMock;- private readonly string _baseTestDataDirectory = Path.Combine("Tools", "TestData", nameof(JsonYamlConverter));-- public JsonYamlConverterCommandLineToolTests()- : base(typeof(JsonYamlConverterCommandLineTool).Assembly)- {- _tool = (JsonYamlConverterCommandLineTool)MefProvider.ImportMany<ICommandLineTool, CommandLineToolMetadata>()- .Single(t => t.Metadata.InternalComponentName == "JsonYamlConverter").Value;-- _loggerMock = new Mock<ILogger>();- Console.SetOut(_consoleWriter);- Console.SetError(_consoleErrorWriter);- }-- [Theory(DisplayName = "Convert with invalid input should return error exit code")]- [InlineData("")]- [InlineData(" ")]- public async Task ConvertJsonWithInvalidInputShouldReturnErrorExitCode(string input)- {- _tool.ConversionMode = JsonToYamlConversion.JsonToYaml;- _tool.Input = input;-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(-1);- }-- #region JsonToYaml-- [Fact(DisplayName = "Convert json with invalid json should output invalid json error")]- public async Task ConvertJsonWithInvalidJsonShouldOutputInvalidJsonError()- {- _tool.ConversionMode = JsonToYamlConversion.JsonToYaml;- _tool.Input = " bar { \"foo\": 123 } ";-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(-1);- string consoleOutput = _consoleErrorWriter.ToString().Trim();- consoleOutput.Should().Be("'b' is an invalid start of a value. LineNumber: 0 | BytePositionInLine: 3.");- }-- [Fact(DisplayName = "Convert json with valid json should output valid yaml")]- public async Task ConvertJsonWithValidJsonAndTwoSpacesShouldOutputValidYaml()- {- _tool.ConversionMode = JsonToYamlConversion.JsonToYaml;- _tool.IndentationMode = Indentation.TwoSpaces;- _tool.Input = "{\r\n \"foo\": \"bar\",\r\n \"fizz\": [\r\n \"wizz\"\r\n ]\r\n}";-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(0);- string consoleOutput = _consoleWriter.ToString().Trim();- consoleOutput.Should().Be("foo: bar\r\nfizz:\r\n - wizz".Replace("\r\n", Environment.NewLine));- }-- [Fact(DisplayName = "Convert json with valid json and four spaces indentation should output valid yaml")]- public async Task ConvertJsonWithValidJsonAndFourSpacesShouldOutputValidYaml()- {- _tool.ConversionMode = JsonToYamlConversion.JsonToYaml;- _tool.IndentationMode = Indentation.FourSpaces;- _tool.Input = "{\r\n \"foo\": \"bar\",\r\n \"fizz\": [\r\n \"wizz\"\r\n ]\r\n}";-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(0);- string consoleOutput = _consoleWriter.ToString().Trim();- consoleOutput.Should().Be("foo: bar\r\nfizz:\r\n - wizz".Replace("\r\n", Environment.NewLine));- }-- [Fact(DisplayName = "Convert json with unknown json file should output invalid json error")]- public async Task ConvertJsonWithUnknownFileInputShouldReturnErrorExitCode()- {- string filePath = Path.Combine(_baseTestDataDirectory, "Unknown.json");- FileInfo inputFile = TestDataProvider.GetFile(filePath);- _tool.ConversionMode = JsonToYamlConversion.JsonToYaml;- _tool.Input = inputFile;- _tool.OutputFile = new FileInfo("Dummy.yaml");- ((MockIFileStorage)MefProvider.Import<IFileStorage>()).FileExistsResult = false;-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(-1);- string consoleOutput = _consoleErrorWriter.ToString().Trim();- consoleOutput.Should().Be(JsonYamlConverter.InputFileNotFound);- }-- [Fact(DisplayName = "Convert json with invalid json file should output invalid json error")]- public async Task ConvertJsonWithInvalidFileInputShouldReturnErrorExitCode()- {- string filePath = Path.Combine(_baseTestDataDirectory, "Invalid.json");- FileInfo inputFile = TestDataProvider.GetFile(filePath);- _tool.ConversionMode = JsonToYamlConversion.JsonToYaml;- _tool.Input = inputFile;- _tool.OutputFile = new FileInfo("Dummy.yaml");-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(-1);- string consoleOutput = _consoleErrorWriter.ToString().Trim();- consoleOutput.Should().Be("'b' is an invalid start of a value. LineNumber: 0 | BytePositionInLine: 3.");- }-- [Fact(DisplayName = "Convert json with valid json file should output valid yaml file")]- public async Task ConvertJsonWithValidFileInputAndTwoSpacesShouldOutputValidYamlFile()- {- string filePath = Path.Combine(_baseTestDataDirectory, "TwoSpaces.json");- FileInfo inputFile = TestDataProvider.GetFile(filePath);- _tool.ConversionMode = JsonToYamlConversion.JsonToYaml;- _tool.Input = inputFile;- _tool.OutputFile = new FileInfo("TwoSpaces.yaml");-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(0);- string outputContent = File.ReadAllText(_tool.OutputFile.FullName);- outputContent.Should().Be("foo: bar\r\nfizz:\r\n - wizz\r\n".Replace("\r\n", Environment.NewLine));- }-- [Fact(DisplayName = "Convert json with valid json file and four spaces should output valid yaml file")]- public async Task ConvertJsonWithValidFileInputAndFourSpacesShouldOutputValidYamlFile()- {- string filePath = Path.Combine(_baseTestDataDirectory, "FourSpaces.json");- FileInfo inputFile = TestDataProvider.GetFile(filePath);- _tool.ConversionMode = JsonToYamlConversion.JsonToYaml;- _tool.IndentationMode = Indentation.FourSpaces;- _tool.Input = inputFile;- _tool.OutputFile = new FileInfo("FourSpaces.yaml");-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(0);- string outputContent = File.ReadAllText(_tool.OutputFile.FullName);- outputContent.Should().Be("foo: bar\r\nfizz:\r\n - wizz\r\n".Replace("\r\n", Environment.NewLine));- }-- #endregion-- #region YamlToJson-- [Fact(DisplayName = "Convert yaml with invalid yaml should output yaml exception message")]- public async Task ConvertYamlWithInvalidYamlShouldOutputYamlExceptionMessage()- {- _tool.ConversionMode = JsonToYamlConversion.YamlToJson;- _tool.Input = "'L' is an invalid start of a value. LineNumber: 0 | BytePositionInLine: 0";-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(-1);- string consoleOutput = _consoleErrorWriter.ToString().Trim();- consoleOutput.Should().Be("While parsing a block mapping, did not find expected key.");- }-- [Fact(DisplayName = "Convert yaml with valid yaml should output valid json")]- public async Task ConvertYamlWithValidYamlShouldOutputValidJson()- {- _tool.ConversionMode = JsonToYamlConversion.YamlToJson;- _tool.Input = "foo: bar\r\nfizz:\r\n - wizz";-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(0);- string consoleOutput = _consoleWriter.ToString().Trim();- consoleOutput.Should().Be("{\r\n \"foo\": \"bar\",\r\n \"fizz\": [\r\n \"wizz\"\r\n ]\r\n}".Replace("\r\n", Environment.NewLine));- }-- [Fact(DisplayName = "Convert yaml with valid yaml and four spaces should output valid json with four spaces")]- public async Task ConvertYamlWithValidYamlAndFourSpacesIndentationShouldOutputValidYaml()- {- _tool.ConversionMode = JsonToYamlConversion.YamlToJson;- _tool.IndentationMode = Indentation.FourSpaces;- _tool.Input = "foo: bar\r\nfizz:\r\n - wizz";-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(0);- string consoleOutput = _consoleWriter.ToString().Trim();- consoleOutput.Should().Be("{\r\n \"foo\": \"bar\",\r\n \"fizz\": [\r\n \"wizz\"\r\n ]\r\n}".Replace("\r\n", Environment.NewLine));- }-- [Fact(DisplayName = "Convert yaml with invalid yaml file should output invalid yaml error")]- public async Task ConvertYamlWithInvalidFileInputShouldReturnErrorExitCode()- {- string filePath = Path.Combine(_baseTestDataDirectory, "Invalid.yaml");- FileInfo inputFile = TestDataProvider.GetFile(filePath);- _tool.ConversionMode = JsonToYamlConversion.YamlToJson;- _tool.Input = inputFile;- _tool.OutputFile = new FileInfo("Dummy.json");-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(-1);- string consoleOutput = _consoleErrorWriter.ToString().Trim();- consoleOutput.Should().Be("While parsing a block mapping, did not find expected key.");- }-- [Fact(DisplayName = "Convert yaml with valid yaml file should output valid json file")]- public async Task ConvertYamlWithValidFileInputAndTwoSpacesShouldOutputValidJsonFile()- {- string filePath = Path.Combine(_baseTestDataDirectory, "TwoSpaces.yaml");- FileInfo inputFile = TestDataProvider.GetFile(filePath);- _tool.ConversionMode = JsonToYamlConversion.YamlToJson;- _tool.Input = inputFile;- _tool.OutputFile = new FileInfo("TwoSpaces.json");-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(0);- string outputContent = File.ReadAllText(_tool.OutputFile.FullName);- outputContent.Should().Be("{\r\n \"foo\": \"bar\",\r\n \"fizz\": [\r\n \"wizz\"\r\n ]\r\n}".Replace("\r\n", Environment.NewLine));- }-- [Fact(DisplayName = "Convert yaml with valid yaml file and four spaces should output valid json file")]- public async Task ConvertYamlWithValidFileInputAndFourSpacesShouldOutputValidJsonFile()- {- string filePath = Path.Combine(_baseTestDataDirectory, "FourSpaces.yaml");- FileInfo inputFile = TestDataProvider.GetFile(filePath);- _tool.ConversionMode = JsonToYamlConversion.YamlToJson;- _tool.IndentationMode = Indentation.FourSpaces;- _tool.Input = inputFile;- _tool.OutputFile = new FileInfo("FourSpaces.json");-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(0);- string outputContent = File.ReadAllText(_tool.OutputFile.FullName);- outputContent.Should().Be("{\r\n \"foo\": \"bar\",\r\n \"fizz\": [\r\n \"wizz\"\r\n ]\r\n}".Replace("\r\n", Environment.NewLine));- }-- #endregion-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Converters/JsonYamlConverterGuiToolTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Converters/JsonYamlConverterGuiToolTests.csdeleted file mode 100644index 83858b65a..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Converters/JsonYamlConverterGuiToolTests.cs+++ /dev/null@@ -1,134 +0,0 @@-using System.Globalization;-using System.Threading.Tasks;-using DevToys.Core.Tools.Metadata;-using DevToys.Tools.Tools.Converters.JsonYaml;--namespace DevToys.UnitTests.Tools.Converters;--public class JsonYamlConverterGuiToolTests : MefBasedTest-{- private readonly UIToolView _toolView;- private readonly JsonYamlConverterGuiTool _tool;- private readonly IUIMultiLineTextInput _inputTextArea;- private readonly IUIMultiLineTextInput _outputTextArea;-- public JsonYamlConverterGuiToolTests()- : base(typeof(JsonYamlConverterGuiTool).Assembly)- {- _tool = (JsonYamlConverterGuiTool)MefProvider.ImportMany<IGuiTool, GuiToolMetadata>()- .Single(t => t.Metadata.InternalComponentName == "JsonYamlConverter")- .Value;-- _toolView = _tool.View;-- _inputTextArea = (IUIMultiLineTextInput)_toolView.GetChildElementById("json-to-yaml-input-text-area");- _outputTextArea = (IUIMultiLineTextInput)_toolView.GetChildElementById("json-to-yaml-output-text-area");- CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture;- CultureInfo.CurrentCulture = CultureInfo.InvariantCulture;- }-- [Theory(DisplayName = "Convert json with invalid json should return json error")]- [InlineData(null)]- [InlineData("")]- [InlineData(" ")]- public async Task ConvertJsonWithInvalidJsonShouldReturnJsonError(string input)- {- _inputTextArea.Text("abc");- _inputTextArea.Text(input);- await _tool.WorkTask;- _outputTextArea.Text.Should().Be(JsonYamlConverter.InvalidJson);- }-- [Fact(DisplayName = "Convert json with invalid json should return json exception message")]- public async Task ConvertJsonWithInvalidJsonShouldReturnJsonExceptionMessage()- {- _inputTextArea.Text(" bar { \"foo\": 123 } ");- await _tool.WorkTask;- _outputTextArea.Text.Should().Be("'b' is an invalid start of a value. LineNumber: 0 | BytePositionInLine: 3.");- }-- [Fact(DisplayName = "Convert json with valid json should return valid yaml")]- public async Task ConvertJsonWithValidJsonShouldReturnValidYaml()- {- _inputTextArea.Text(" { \"foo\": \"bar\" } ");- await _tool.WorkTask;- _outputTextArea.Text.Should().Be("foo: bar\r\n".Replace("\r\n", Environment.NewLine));- }-- [Fact(DisplayName = "Convert json with valid json and two spaces indentation should return valid yaml")]- public async Task ConvertJsonWithValidJsonAndTwoSpacesShouldReturnValidYaml()- {- _inputTextArea.Text("{\r\n \"foo\": \"bar\",\r\n \"fizz\": [\r\n \"wizz\"\r\n ]\r\n}");-- var indentationOptions = (IUISelectDropDownList)((IUISetting)_toolView.GetChildElementById("json-to-yaml-text-indentation-setting")).InteractiveElement;- indentationOptions.Select(0); // Select TwoSpaces-- await _tool.WorkTask;- _outputTextArea.Text.Should().Be("foo: bar\r\nfizz:\r\n - wizz\r\n".Replace("\r\n", Environment.NewLine));- }-- [Fact(DisplayName = "Convert json with valid json and four spaces indentation should return valid yaml")]- public async Task ConvertJsonWithValidJsonAndFourSpacesShouldReturnValidYaml()- {- _inputTextArea.Text("{\r\n \"foo\": \"bar\",\r\n \"fizz\": [\r\n \"wizz\"\r\n ]\r\n}");-- var indentationOptions = (IUISelectDropDownList)((IUISetting)_toolView.GetChildElementById("json-to-yaml-text-indentation-setting")).InteractiveElement;- indentationOptions.Select(1); // Select FourSpaces-- await _tool.WorkTask;- _outputTextArea.Text.Should().Be("foo: bar\r\nfizz:\r\n - wizz\r\n".Replace("\r\n", Environment.NewLine));- }-- [Theory(DisplayName = "Convert yaml with invalid input should return yaml error")]- [InlineData(null)]- [InlineData("")]- [InlineData(" ")]- public async Task ConvertYamlWithInvalidYamlShouldReturnYamlError(string input)- {- var conversionSettings = (IUISelectDropDownList)((IUISetting)_toolView.GetChildElementById("json-to-yaml-text-conversion-setting")).InteractiveElement;- conversionSettings.Select(1); // Select YamlToJson-- _inputTextArea.Text(input);- await _tool.WorkTask;- _outputTextArea.Text.Should().Be(JsonYamlConverter.InvalidYaml);- }-- [Fact(DisplayName = "Convert yaml with invalid yaml should return yaml exception message")]- public async Task ConvertYamlWithInvalidYamlShouldReturnYamlExceptionMessage()- {- var conversionSettings = (IUISelectDropDownList)((IUISetting)_toolView.GetChildElementById("json-to-yaml-text-conversion-setting")).InteractiveElement;- conversionSettings.Select(1); // Select YamlToJson-- _inputTextArea.Text("'L' is an invalid start of a value. LineNumber: 0 | BytePositionInLine: 0.");- await _tool.WorkTask;- _outputTextArea.Text.Should().Be("While parsing a block mapping, did not find expected key.");- }-- [Fact(DisplayName = "Convert yaml with valid yaml should return valid json")]- public async Task ConvertYamlWithValidYamlShouldReturnValidJson()- {- var conversionSettings = (IUISelectDropDownList)((IUISetting)_toolView.GetChildElementById("json-to-yaml-text-conversion-setting")).InteractiveElement;- conversionSettings.Select(1); // Select YamlToJson-- var indentationOptions = (IUISelectDropDownList)((IUISetting)_toolView.GetChildElementById("json-to-yaml-text-indentation-setting")).InteractiveElement;- indentationOptions.Select(0); // Select TwoSpaces-- _inputTextArea.Text("foo: bar\r\nfizz:\r\n - wizz\r\n\r\n");- await _tool.WorkTask;- _outputTextArea.Text.Should().Be("{\r\n \"foo\": \"bar\",\r\n \"fizz\": [\r\n \"wizz\"\r\n ]\r\n}".Replace("\r\n", Environment.NewLine));- }-- [Fact(DisplayName = "Convert yaml with valid yaml and four spaces should return valid json with four spaces")]- public async Task ConvertYamlWithValidYamlAndFourSpacesIndentationShouldReturnValidYaml()- {- var conversionSettings = (IUISelectDropDownList)((IUISetting)_toolView.GetChildElementById("json-to-yaml-text-conversion-setting")).InteractiveElement;- conversionSettings.Select(1); // Select YamlToJson-- var indentationOptions = (IUISelectDropDownList)((IUISetting)_toolView.GetChildElementById("json-to-yaml-text-indentation-setting")).InteractiveElement;- indentationOptions.Select(1); // Select FourSpaces-- _inputTextArea.Text("foo: bar\r\nfizz:\r\n - wizz\r\n\r\n");- await _tool.WorkTask;- _outputTextArea.Text.Should().Be("{\r\n \"foo\": \"bar\",\r\n \"fizz\": [\r\n \"wizz\"\r\n ]\r\n}".Replace("\r\n", Environment.NewLine));- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/EncodersDecoders/Base64Image/Base64ImageEncoderDecoderCommandLineToolTests.cs b/src/app/tests/DevToys.UnitTests/Tools/EncodersDecoders/Base64Image/Base64ImageEncoderDecoderCommandLineToolTests.csdeleted file mode 100644index cdf07af1f..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/EncodersDecoders/Base64Image/Base64ImageEncoderDecoderCommandLineToolTests.cs+++ /dev/null@@ -1,74 +0,0 @@-using System.IO;-using System.Threading;-using System.Threading.Tasks;-using DevToys.CLI;-using DevToys.Tools.Tools.EncodersDecoders.Base64Image;--namespace DevToys.UnitTests.Tools.EncodersDecoders.Base64Image;--[Collection(nameof(TestParallelizationDisabled))]-public sealed class Base64ImageEncoderDecoderCommandLineToolTests : MefBasedTest-{- private readonly Base64ImageEncoderDecoderCommandLineTool _tool;- private readonly string _baseTestDataDirectory = Path.Combine("Tools", "TestData", nameof(Base64ImageEncoderDecoder));-- public Base64ImageEncoderDecoderCommandLineToolTests()- : base(typeof(Base64ImageEncoderDecoderCommandLineTool).Assembly)- {- _tool = (Base64ImageEncoderDecoderCommandLineTool)MefProvider.ImportMany<ICommandLineTool, CommandLineToolMetadata>()- .Single(t => t.Metadata.InternalComponentName == "Base64ImageEncoderDecoder")- .Value;- }-- [Fact]- public async Task EncodeImage()- {- string filePath = Path.Combine(_baseTestDataDirectory, "PNG_transparency_demonstration_1.png");- FileInfo inputFile = TestDataProvider.GetFile(filePath);-- _tool.Input = inputFile;-- using var consoleOutput = new ConsoleOutputMonitor();- await _tool.InvokeAsync(new MockILogger(), CancellationToken.None);-- string expectedResult = File.ReadAllText(TestDataProvider.GetFile(Path.Combine(_baseTestDataDirectory, "PNG_transparency_demonstration_1_base64.txt")).FullName);- string result = consoleOutput.GetOutput().Trim();- result.Should().Be(expectedResult);- }-- [Fact]- public async Task DecodeImageFromText()- {- byte[] expectedOutput = File.ReadAllBytes(Path.Combine(_baseTestDataDirectory, "PNG_transparency_demonstration_1.png"));- string filePath = Path.Combine(_baseTestDataDirectory, "PNG_transparency_demonstration_1_base64.txt");- FileInfo inputFile = TestDataProvider.GetFile(filePath);-- _tool.Input = File.ReadAllText(inputFile.FullName);- _tool.OutputFile = new FileInfo(Path.Combine(_baseTestDataDirectory, "testResult.png"));-- using var consoleOutput = new ConsoleOutputMonitor();- await _tool.InvokeAsync(new MockILogger(), CancellationToken.None);-- byte[] result = File.ReadAllBytes(_tool.OutputFile.FullName);- expectedOutput.Should().BeEquivalentTo(result);- _tool.OutputFile.Delete();- }-- [Fact]- public async Task DecodeImageFromFile()- {- byte[] expectedOutput = File.ReadAllBytes(TestDataProvider.GetFile(Path.Combine(_baseTestDataDirectory, "PNG_transparency_demonstration_1.png")).FullName);- string filePath = Path.Combine(_baseTestDataDirectory, "PNG_transparency_demonstration_1_base64.txt");- FileInfo inputFile = TestDataProvider.GetFile(filePath);-- _tool.Input = inputFile;- _tool.OutputFile = new FileInfo(TestDataProvider.GetFile(Path.Combine(_baseTestDataDirectory, "testResult.png")).FullName);-- using var consoleOutput = new ConsoleOutputMonitor();- await _tool.InvokeAsync(new MockILogger(), CancellationToken.None);-- byte[] result = File.ReadAllBytes(_tool.OutputFile.FullName);- expectedOutput.Should().BeEquivalentTo(result);- _tool.OutputFile.Delete();- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/EncodersDecoders/Base64Image/Base64ImageEncoderDecoderGuiToolTests.cs b/src/app/tests/DevToys.UnitTests/Tools/EncodersDecoders/Base64Image/Base64ImageEncoderDecoderGuiToolTests.csdeleted file mode 100644index ce2e2ce42..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/EncodersDecoders/Base64Image/Base64ImageEncoderDecoderGuiToolTests.cs+++ /dev/null@@ -1,54 +0,0 @@-using System.IO;-using System.Threading.Tasks;-using DevToys.Blazor.Core;-using DevToys.Core.Tools.Metadata;-using DevToys.Tools.Tools.EncodersDecoders.Base64Image;--namespace DevToys.UnitTests.Tools.EncodersDecoders.Base64Image;--public sealed class Base64ImageEncoderDecoderGuiToolTests : MefBasedTest-{- private readonly Base64ImageEncoderDecoderGuiTool _tool;- private readonly UIToolView _toolView;- private readonly IUIMultiLineTextInput _inputBox;- private readonly IUIFileSelector _fileSelector;- private readonly IUIImageViewer _imageViewer;- private readonly string _baseTestDataDirectory = Path.Combine("Tools", "TestData", nameof(Base64ImageEncoderDecoder));-- public Base64ImageEncoderDecoderGuiToolTests()- : base(typeof(Base64ImageEncoderDecoderGuiTool).Assembly)- {- _tool = (Base64ImageEncoderDecoderGuiTool)MefProvider.ImportMany<IGuiTool, GuiToolMetadata>()- .Single(t => t.Metadata.InternalComponentName == "Base64ImageEncoderDecoder")- .Value;-- _toolView = _tool.View;-- _inputBox = (IUIMultiLineTextInput)_toolView.GetChildElementById("base64-image-input-box");- _fileSelector = (IUIFileSelector)_toolView.GetChildElementById("base64-image-file-selector");- _imageViewer = (IUIImageViewer)_toolView.GetChildElementById("base64-image-preview");- }-- [Fact]- public async Task EncodeImage()- {- string filePath = Path.Combine(_baseTestDataDirectory, "PNG_transparency_demonstration_1.png");- FileInfo inputFile = TestDataProvider.GetFile(filePath);- using var fileStream = new BlazorSandboxedFileReader(inputFile, new MockIFileStorage());-- _fileSelector.WithFiles(fileStream);- await _tool.WorkTask;- _inputBox.Text.Should().Be(File.ReadAllText(TestDataProvider.GetFile(Path.Combine(_baseTestDataDirectory, "PNG_transparency_demonstration_1_base64.txt")).FullName));- }-- [Fact]- public async Task DecodeImage()- {- string filePath = Path.Combine(_baseTestDataDirectory, "PNG_transparency_demonstration_1_base64.txt");- FileInfo inputFile = TestDataProvider.GetFile(filePath);-- _inputBox.Text(File.ReadAllText(inputFile.FullName));- await _tool.WorkTask;- _imageViewer.ImageSource.Value.Value.Should().BeOfType<FileInfo>();- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/EncodersDecoders/Base64Text/Base64TextEncoderDecoderGuiToolTests.cs b/src/app/tests/DevToys.UnitTests/Tools/EncodersDecoders/Base64Text/Base64TextEncoderDecoderGuiToolTests.csdeleted file mode 100644index a4507dabd..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/EncodersDecoders/Base64Text/Base64TextEncoderDecoderGuiToolTests.cs+++ /dev/null@@ -1,64 +0,0 @@-using System.Threading.Tasks;-using DevToys.Core.Tools.Metadata;-using DevToys.Tools.Tools.EncodersDecoders.Base64Text;--namespace DevToys.UnitTests.Tools.EncodersDecoders.Base64Text;--public sealed class Base64TextEncoderDecoderGuiToolTests : MefBasedTest-{- private readonly Base64TextEncoderDecoderGuiTool _tool;- private readonly UIToolView _toolView;- private readonly IUIMultiLineTextInput _inputBox;- private readonly IUIMultiLineTextInput _outputBox;-- public Base64TextEncoderDecoderGuiToolTests()- : base(typeof(Base64TextEncoderDecoderGuiTool).Assembly)- {- _tool = (Base64TextEncoderDecoderGuiTool)MefProvider.ImportMany<IGuiTool, GuiToolMetadata>()- .Single(t => t.Metadata.InternalComponentName == "Base64TextEncoderDecoder")- .Value;-- _toolView = _tool.View;-- _inputBox = (IUIMultiLineTextInput)_toolView.GetChildElementById("base64-text-input-box");- _outputBox = (IUIMultiLineTextInput)_toolView.GetChildElementById("base64-text-output-box");- }-- [Fact]- public async Task EncodeUtf8()- {- _inputBox.Text("Hello world &é'(-è_çèà)");- await _tool.WorkTask;- _outputBox.Text.Should().Be("SGVsbG8gd29ybGQgJsOpJygtw6hfw6fDqMOgKQ==");- }-- [Fact]- public async Task EncodeAscii()- {- var encodingOption = (IUISelectDropDownList)((IUISetting)_toolView.GetChildElementById("base64-text-encoding-setting")).InteractiveElement;- encodingOption.Select(1); // Select ASCII-- _inputBox.Text("Hello world &é'(-è_çèà)");- await _tool.WorkTask;- _outputBox.Text.Should().Be("SGVsbG8gd29ybGQgJj8nKC0/Xz8/Pyk=");- }-- [Fact]- public async Task SwitchConversionMode()- {- var conversionMode = (IUISwitch)_toolView.GetChildElementById("base64-text-conversion-mode-switch");-- await EncodeUtf8();-- conversionMode.Off(); // Switch to Decode-- await _tool.WorkTask;- _inputBox.Text.Should().Be("SGVsbG8gd29ybGQgJsOpJygtw6hfw6fDqMOgKQ==");- await _tool.WorkTask;- _outputBox.Text("Hello world &é'(-è_çèà)");-- conversionMode.On(); // Switch to Encode- await _tool.WorkTask;- await EncodeUtf8();- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/EncodersDecoders/Certificate/CertificateDecoderCommandLineToolTests.cs b/src/app/tests/DevToys.UnitTests/Tools/EncodersDecoders/Certificate/CertificateDecoderCommandLineToolTests.csdeleted file mode 100644index 4268905b2..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/EncodersDecoders/Certificate/CertificateDecoderCommandLineToolTests.cs+++ /dev/null@@ -1,82 +0,0 @@-using System.IO;-using System.Threading;-using System.Threading.Tasks;-using DevToys.CLI;-using DevToys.Tools.Tools.EncodersDecoders.Certificate;-using DevToys.UnitTests.Tools.Helpers;--namespace DevToys.UnitTests.Tools.EncodersDecoders.Certificate;--[Collection(nameof(TestParallelizationDisabled))]-public sealed class CertificateDecoderCommandLineToolTests : MefBasedTest-{- private readonly CertificateDecoderCommandLineTool _tool;- private readonly string _baseTestDataDirectory = Path.Combine("Tools", "TestData", nameof(CertificateDecoder));-- public CertificateDecoderCommandLineToolTests()- : base(typeof(CertificateDecoderCommandLineTool).Assembly)- {- _tool = (CertificateDecoderCommandLineTool)MefProvider.ImportMany<ICommandLineTool, CommandLineToolMetadata>()- .Single(t => t.Metadata.InternalComponentName == "CertificateDecoder")- .Value;- }-- [Fact]- public async Task ReadCertificateFromFile()- {- string filePath = Path.Combine(_baseTestDataDirectory, "PfxWithPassword.pfx");- FileInfo inputFile = TestDataProvider.GetFile(filePath);-- _tool.Input = inputFile;-- using (var consoleOutput = new ConsoleOutputMonitor())- {- await _tool.InvokeAsync(new MockILogger(), CancellationToken.None);-- string result = consoleOutput.GetError().Trim();- result.Should().Be(CertificateDecoder.InvalidPasswordError);- }-- _tool.Password = "test1234";-- using (var consoleOutput = new ConsoleOutputMonitor())- {- await _tool.InvokeAsync(new MockILogger(), CancellationToken.None);-- string expectedResult = CertificateHelperTests.CleanDateTimes(File.ReadAllText(TestDataProvider.GetFile(Path.Combine(_baseTestDataDirectory, "CertDecoded.txt")).FullName)).Trim();- string result = CertificateHelperTests.CleanDateTimes(consoleOutput.GetOutput()).Trim();- result.Should().Be(expectedResult);- }- }-- [Fact]- public async Task ReadCertificateFromText()- {- string input = File.ReadAllText(TestDataProvider.GetFile(Path.Combine(_baseTestDataDirectory, "PemCertPublic.txt")).FullName);-- _tool.Input = input;-- using (var consoleOutput = new ConsoleOutputMonitor())- {- await _tool.InvokeAsync(new MockILogger(), CancellationToken.None);-- string expectedResult = CertificateHelperTests.CleanDateTimes(File.ReadAllText(TestDataProvider.GetFile(Path.Combine(_baseTestDataDirectory, "CertDecoded.txt")).FullName)).Trim();- string result = CertificateHelperTests.CleanDateTimes(consoleOutput.GetOutput()).Trim();- result.Should().Be(expectedResult);- }- }-- [Fact]- public async Task InvalidCertificate()- {- _tool.Input = "hello";-- using (var consoleOutput = new ConsoleOutputMonitor())- {- await _tool.InvokeAsync(new MockILogger(), CancellationToken.None);-- string result = consoleOutput.GetError().Trim();- result.Should().Be(CertificateDecoder.UnsupportedFormatError);- }- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/EncodersDecoders/Certificate/CertificateDecoderGuiToolTests.cs b/src/app/tests/DevToys.UnitTests/Tools/EncodersDecoders/Certificate/CertificateDecoderGuiToolTests.csdeleted file mode 100644index 0751e5374..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/EncodersDecoders/Certificate/CertificateDecoderGuiToolTests.cs+++ /dev/null@@ -1,78 +0,0 @@-using System.IO;-using System.Threading.Tasks;-using DevToys.Blazor.Core;-using DevToys.Core.Tools.Metadata;-using DevToys.Tools.Tools.EncodersDecoders.Certificate;-using DevToys.UnitTests.Tools.Helpers;--namespace DevToys.UnitTests.Tools.EncodersDecoders.Certificate;--public sealed class CertificateDecoderGuiToolTests : MefBasedTest-{- private readonly CertificateDecoderGuiTool _tool;- private readonly UIToolView _toolView;- private readonly IUIMultiLineTextInput _inputBox;- private readonly IUISingleLineTextInput _password;- private readonly IUIMultiLineTextInput _outputBox;- private readonly IUIFileSelector _fileSelector;- private readonly string _baseTestDataDirectory = Path.Combine("Tools", "TestData", nameof(CertificateDecoder));-- public CertificateDecoderGuiToolTests()- : base(typeof(CertificateDecoderGuiTool).Assembly)- {- _tool = (CertificateDecoderGuiTool)MefProvider.ImportMany<IGuiTool, GuiToolMetadata>()- .Single(t => t.Metadata.InternalComponentName == "CertificateDecoder")- .Value;-- _toolView = _tool.View;-- _inputBox = (IUIMultiLineTextInput)_toolView.GetChildElementById("certificate-decoder-input");- _outputBox = (IUIMultiLineTextInput)_toolView.GetChildElementById("certificate-decoder-output");- _password = (IUIPasswordInput)_toolView.GetChildElementById("certificate-decoder-password-input");- _fileSelector = (IUIFileSelector)_toolView.GetChildElementById("certificate-decoder-file-selector");- }-- [Fact]- public async Task ReadCertificateFromFile()- {- string filePath = Path.Combine(_baseTestDataDirectory, "PfxWithPassword.pfx");- FileInfo inputFile = TestDataProvider.GetFile(filePath);- using var fileStream = new BlazorSandboxedFileReader(inputFile, new MockIFileStorage());-- _fileSelector.WithFiles(fileStream);-- await Task.Delay(300); // Delay because the IUIFileSelector.SelectedFiles setter is async but we don't wait for it to finish. Could be improved in the future.- await _tool.WorkTask;-- _outputBox.Text.Should().Be(CertificateDecoder.InvalidPasswordError);-- _password.Text("test1234");- await _tool.WorkTask;-- string expectResult = CertificateHelperTests.CleanDateTimes(File.ReadAllText(TestDataProvider.GetFile(Path.Combine(_baseTestDataDirectory, "CertDecoded.txt")).FullName));- CertificateHelperTests.CleanDateTimes(_outputBox.Text).Should().Be(expectResult);- }-- [Fact]- public async Task ReadCertificateFromText()- {- string input = File.ReadAllText(TestDataProvider.GetFile(Path.Combine(_baseTestDataDirectory, "PemCertPublic.txt")).FullName);-- _inputBox.Text(input);-- await _tool.WorkTask;-- string expectResult = CertificateHelperTests.CleanDateTimes(File.ReadAllText(TestDataProvider.GetFile(Path.Combine(_baseTestDataDirectory, "CertDecoded.txt")).FullName));- CertificateHelperTests.CleanDateTimes(_outputBox.Text).Should().Be(expectResult);- }-- [Fact]- public async Task InvalidCertificate()- {- _inputBox.Text("hello");-- await _tool.WorkTask;-- _outputBox.Text.Should().Be(CertificateDecoder.UnsupportedFormatError);- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/EncodersDecoders/GZip/GZipEncoderDecoderGuiToolTests.cs b/src/app/tests/DevToys.UnitTests/Tools/EncodersDecoders/GZip/GZipEncoderDecoderGuiToolTests.csdeleted file mode 100644index 1a2e28fe4..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/EncodersDecoders/GZip/GZipEncoderDecoderGuiToolTests.cs+++ /dev/null@@ -1,50 +0,0 @@-using System.Threading.Tasks;-using DevToys.Core.Tools.Metadata;-using DevToys.Tools.Tools.EncodersDecoders.GZip;--namespace DevToys.UnitTests.Tools.EncodersDecoders.GZip;--public sealed class GZipEncoderDecoderGuiToolTests : MefBasedTest-{- private readonly GZipEncoderDecoderGuiTool _tool;- private readonly UIToolView _toolView;- private readonly IUIMultiLineTextInput _inputBox;- private readonly IUIMultiLineTextInput _outputBox;-- public GZipEncoderDecoderGuiToolTests()- : base(typeof(GZipEncoderDecoderGuiTool).Assembly)- {- _tool = (GZipEncoderDecoderGuiTool)MefProvider.ImportMany<IGuiTool, GuiToolMetadata>()- .Single(t => t.Metadata.InternalComponentName == "GZipEncoderDecoder")- .Value;-- _toolView = _tool.View;-- _inputBox = (IUIMultiLineTextInput)_toolView.GetChildElementById("gzip-input-box");- _outputBox = (IUIMultiLineTextInput)_toolView.GetChildElementById("gzip-output-box");- }-- [Fact]- public async Task SwitchConversionMode()- {- var conversionMode = (IUISwitch)_toolView.GetChildElementById("gzip-compression-mode-switch");-- _inputBox.Text("<hello world>");- await _tool.WorkTask;- _outputBox.Text.Should().Be("H4sIAAAAAAAACrPJSM3JyVcozy/KSbEDAKEb3mcNAAAA");-- conversionMode.Off(); // Switch to Decompress-- await _tool.WorkTask;- _inputBox.Text.Should().Be("H4sIAAAAAAAACrPJSM3JyVcozy/KSbEDAKEb3mcNAAAA");- await _tool.WorkTask;- _outputBox.Text("<hello world>");-- conversionMode.On(); // Switch to Compress-- await _tool.WorkTask;- _inputBox.Text("<hello world>");- await _tool.WorkTask;- _outputBox.Text.Should().Be("H4sIAAAAAAAACrPJSM3JyVcozy/KSbEDAKEb3mcNAAAA");- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/EncodersDecoders/Html/HtmlEncoderDecoderGuiToolTests.cs b/src/app/tests/DevToys.UnitTests/Tools/EncodersDecoders/Html/HtmlEncoderDecoderGuiToolTests.csdeleted file mode 100644index 0b58e5946..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/EncodersDecoders/Html/HtmlEncoderDecoderGuiToolTests.cs+++ /dev/null@@ -1,50 +0,0 @@-using System.Threading.Tasks;-using DevToys.Core.Tools.Metadata;-using DevToys.Tools.Tools.EncodersDecoders.Html;--namespace DevToys.UnitTests.Tools.EncodersDecoders.Html;--public sealed class HtmlEncoderDecoderGuiToolTests : MefBasedTest-{- private readonly HtmlEncoderDecoderGuiTool _tool;- private readonly UIToolView _toolView;- private readonly IUIMultiLineTextInput _inputBox;- private readonly IUIMultiLineTextInput _outputBox;-- public HtmlEncoderDecoderGuiToolTests()- : base(typeof(HtmlEncoderDecoderGuiTool).Assembly)- {- _tool = (HtmlEncoderDecoderGuiTool)MefProvider.ImportMany<IGuiTool, GuiToolMetadata>()- .Single(t => t.Metadata.InternalComponentName == "HtmlEncoderDecoder")- .Value;-- _toolView = _tool.View;-- _inputBox = (IUIMultiLineTextInput)_toolView.GetChildElementById("html-input-box");- _outputBox = (IUIMultiLineTextInput)_toolView.GetChildElementById("html-output-box");- }-- [Fact]- public async Task SwitchConversionMode()- {- var conversionMode = (IUISwitch)_toolView.GetChildElementById("html-conversion-mode-switch");-- _inputBox.Text("<hello>");- await _tool.WorkTask;- _outputBox.Text.Should().Be("<hello>");-- conversionMode.Off(); // Switch to Decode-- await _tool.WorkTask;- _inputBox.Text.Should().Be("<hello>");- await _tool.WorkTask;- _outputBox.Text("<hello>");-- conversionMode.On(); // Switch to Encode-- await _tool.WorkTask;- _inputBox.Text("<hello>");- await _tool.WorkTask;- _outputBox.Text.Should().Be("<hello>");- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/EncodersDecoders/JsonWebToken/JsonWebTokenDecoderGuiToolTests.cs b/src/app/tests/DevToys.UnitTests/Tools/EncodersDecoders/JsonWebToken/JsonWebTokenDecoderGuiToolTests.csdeleted file mode 100644index fce7f9003..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/EncodersDecoders/JsonWebToken/JsonWebTokenDecoderGuiToolTests.cs+++ /dev/null@@ -1,236 +0,0 @@-using System.Globalization;-using System.Threading.Tasks;-using DevToys.Core.Tools.Metadata;-using DevToys.Tools.Tools.EncodersDecoders.JsonWebToken;--namespace DevToys.UnitTests.Tools.EncodersDecoders.JsonWebToken;--public sealed class JsonWebTokenDecoderGuiToolTests : MefBasedTest-{- private const string ToolName = "JsonWebTokenEncoderDecoder";- private const string BaseAssembly = "DevToys.UnitTests.Tools.TestData";-- private readonly JsonWebTokenDecoderGuiTool _decodeTool;- private readonly JsonWebTokenEncoderDecoderGuiTool _tool;- private readonly UIToolView _toolView;-- private readonly IUISwitch _toolMode;-- private readonly IUIInfoBar _infoBar;-- private readonly IUISwitch _validateTokenSwitch;- private readonly IUISwitch _validateIssuersSwitch;- private readonly IUISwitch _validateIssuerSigningKeySwitch;- private readonly IUISwitch _validateAudiencesSwitch;- private readonly IUISwitch _validateLifetimeSwitch;- private readonly IUISwitch _validateActorsSwitch;-- private readonly IUIMultiLineTextInput _tokenInput;- private readonly IUIMultiLineTextInput _headerInput;- private readonly IUIMultiLineTextInput _payloadInput;- private readonly IUIMultiLineTextInput _signatureInput;- private readonly IUIMultiLineTextInput _publicKeyInput;-- private readonly IUISingleLineTextInput _validateIssuersInput;- private readonly IUISingleLineTextInput _validateAudiencesInput;-- public JsonWebTokenDecoderGuiToolTests()- : base(typeof(JsonWebTokenDecoderGuiTool).Assembly)- {- _tool = (JsonWebTokenEncoderDecoderGuiTool)MefProvider.ImportMany<IGuiTool, GuiToolMetadata>()- .Single(t => t.Metadata.InternalComponentName == "JsonWebTokenEncoderDecoder")- .Value;-- _toolView = _tool.View;- _toolMode = (IUISwitch)_toolView.GetChildElementById("jwt-token-conversion-mode-switch");-- _decodeTool = _tool.DecoderGuiTool;- _infoBar = (IUIInfoBar)_toolView.GetChildElementById("jwt-decode-info-bar");- _validateTokenSwitch = (IUISwitch)_toolView.GetChildElementById("jwt-decode-validate-token-switch");- _validateIssuerSigningKeySwitch = (IUISwitch)_toolView.GetChildElementById("jwt-decode-validate-token-issuer-signing-key-switch");- _validateIssuersSwitch = (IUISwitch)_toolView.GetChildElementById("jwt-decode-validate-token-issuers-switch");- _validateAudiencesSwitch = (IUISwitch)_toolView.GetChildElementById("jwt-decode-validate-token-audiences-switch");- _validateLifetimeSwitch = (IUISwitch)_toolView.GetChildElementById("jwt-decode-validate-token-lifetime-switch");- _validateActorsSwitch = (IUISwitch)_toolView.GetChildElementById("jwt-decode-validate-token-actors-switch");- _tokenInput = (IUIMultiLineTextInput)_toolView.GetChildElementById("jwt-decode-token-input");- _headerInput = (IUIMultiLineTextInput)_toolView.GetChildElementById("jwt-decode-header-input");- _payloadInput = (IUIMultiLineTextInput)_toolView.GetChildElementById("jwt-decode-payload-input");- _signatureInput = (IUIMultiLineTextInput)_toolView.GetChildElementById("jwt-decode-signature-input");- _publicKeyInput = (IUIMultiLineTextInput)_toolView.GetChildElementById("jwt-decode-public-key-input");- _validateIssuersInput = (IUISingleLineTextInput)_toolView.GetChildElementById("jwt-decode-validate-token-issuers-input");- _validateAudiencesInput = (IUISingleLineTextInput)_toolView.GetChildElementById("jwt-decode-validate-token-audiences-input");-- CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture;- CultureInfo.CurrentCulture = CultureInfo.InvariantCulture;- }-- [Fact(DisplayName = "Decode Json Web Token with Invalid Token should return false")]- public async Task DecodeTokenWithInvalidTokenShouldReturnError()- {- _toolMode.Off();- _tokenInput.Text("eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ");- await _decodeTool.WorkTask;- _payloadInput.Text.Should().BeEmpty();- _headerInput.Text.Should().BeEmpty();- _infoBar.Description.Should().StartWith("IDX14100: JWT is not well formed, there are no dots (.).");- _infoBar.Severity.Should().Be(UIInfoBarSeverity.Error);- }-- [Fact(DisplayName = "Decode Json Web Token with Invalid Issuers should return false")]- public async Task DecodeTokenWithInvalidIssuersShouldReturnError()- {- string tokenContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.HS.HS256-BasicToken.txt");- string signatureContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.HS.HS256-Signature.txt");-- _toolMode.Off();- _validateTokenSwitch.On();- _validateIssuersSwitch.On();- _tokenInput.Text(tokenContent);- _signatureInput.Text(signatureContent);- await _decodeTool.WorkTask;- _payloadInput.Text.Should().BeEmpty();- _headerInput.Text.Should().BeEmpty();- _infoBar.Description.Should().StartWith("IDX10205: Issuer validation failed.");- _infoBar.Severity.Should().Be(UIInfoBarSeverity.Error);- }-- [Fact(DisplayName = "Decode Json Web Token with Invalid Audience should return false")]- public async Task DecodeTokenWithInvalidAudienceShouldReturnError()- {- string tokenContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.HS.HS256-BasicToken.txt");- string signatureContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.HS.HS256-Signature.txt");-- _toolMode.Off();- _validateTokenSwitch.On();- _validateAudiencesSwitch.On();- _tokenInput.Text(tokenContent);- _signatureInput.Text(signatureContent);- await _decodeTool.WorkTask;- _payloadInput.Text.Should().BeEmpty();- _headerInput.Text.Should().BeEmpty();- _infoBar.Description.Should().StartWith("IDX10214: Audience validation failed.");- _infoBar.Severity.Should().Be(UIInfoBarSeverity.Error);- }-- [Fact(DisplayName = "Decode Json Web Token with Invalid Expired Lifetime should return false")]- public async Task DecodeTokenWithInvalidExpiredLifetimeShouldReturnError()- {- string tokenContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.HS.HS256-BasicToken.txt");- string signatureContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.HS.HS256-Signature.txt");-- _toolMode.Off();- _validateTokenSwitch.On();- _validateLifetimeSwitch.On();- _tokenInput.Text(tokenContent);- _signatureInput.Text(signatureContent);- await _decodeTool.WorkTask;- _payloadInput.Text.Should().BeEmpty();- _headerInput.Text.Should().BeEmpty();- _infoBar.Description.Should().StartWith("IDX10225: Lifetime validation failed.");- _infoBar.Severity.Should().Be(UIInfoBarSeverity.Error);- }-- [Fact(DisplayName = "Decode Json Web Token with Valid HS Token should return decoded payload")]- public async Task DecodeTokenWithValidHSTokenShouldReturnDecodedPayload()- {- string headerContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.HS.HS256-Header.json");- string payloadContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ComplexPayload.json");-- string tokenContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.HS.HS256-ComplexToken.txt");- string signatureContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.HS.HS256-Signature.txt");-- _toolMode.Off();- _validateTokenSwitch.On();- _validateActorsSwitch.On();- _validateIssuersSwitch.On();- _validateIssuerSigningKeySwitch.On();- _validateAudiencesSwitch.On();- _tokenInput.Text(tokenContent);- _validateIssuersInput.Text("devtoys");- _validateAudiencesInput.Text("devtoys");- _signatureInput.Text(signatureContent);- await _decodeTool.WorkTask;- _infoBar.Description.Should().Be(JsonWebTokenEncoderDecoder.ValidToken);- _infoBar.Severity.Should().Be(UIInfoBarSeverity.Success);- _payloadInput.Text.Should().Be(payloadContent);- _headerInput.Text.Should().Be(headerContent);- }-- [Fact(DisplayName = "Decode Json Web Token with Valid RS Token should return decoded payload")]- public async Task DecodeTokenWithValidRSTokenShouldReturnDecodedPayload()- {- string headerContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.RS.RS256-Header.json");- string payloadContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ComplexPayload.json");-- string tokenContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.RS.RS256-ComplexToken.txt");- string publicKeyContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.RS.RS256-PublicKey.txt");-- _toolMode.Off();- _validateTokenSwitch.On();- _validateActorsSwitch.On();- _validateIssuersSwitch.On();- _validateIssuerSigningKeySwitch.On();- _validateAudiencesSwitch.On();- _tokenInput.Text(tokenContent);- _validateIssuersInput.Text("devtoys");- _validateAudiencesInput.Text("devtoys");- _publicKeyInput.Text(publicKeyContent);- await _decodeTool.WorkTask;- _infoBar.Description.Should().Be(JsonWebTokenEncoderDecoder.ValidToken);- _infoBar.Severity.Should().Be(UIInfoBarSeverity.Success);- _payloadInput.Text.Should().Be(payloadContent);- _headerInput.Text.Should().Be(headerContent);- }-- [Fact(DisplayName = "Decode Json Web Token with Valid PS Token should return decoded payload")]- public async Task DecodeTokenWithValidPSTokenShouldReturnDecodedPayload()- {- string headerContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.PS.PS512-Header.json");- string payloadContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ComplexPayload.json");-- string tokenContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.PS.PS512-ComplexToken.txt");- string publicKeyContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.PS.PS512-PublicKey.txt");-- _toolMode.Off();- _validateTokenSwitch.On();- _validateActorsSwitch.On();- _validateIssuersSwitch.On();- _validateIssuerSigningKeySwitch.On();- _validateAudiencesSwitch.On();- _tokenInput.Text(tokenContent);- _validateIssuersInput.Text("devtoys");- _validateAudiencesInput.Text("devtoys");- _publicKeyInput.Text(publicKeyContent);- await _decodeTool.WorkTask;- _infoBar.Description.Should().Be(JsonWebTokenEncoderDecoder.ValidToken);- _infoBar.Severity.Should().Be(UIInfoBarSeverity.Success);- _payloadInput.Text.Should().Be(payloadContent);- _headerInput.Text.Should().Be(headerContent);- }-- [Fact(DisplayName = "Decode Json Web Token with Valid ES Token should return decoded payload")]- public async Task DecodeTokenWithValidESTokenShouldReturnDecodedPayload()- {- string headerContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ES.ES512-Header.json");- string payloadContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ComplexPayload.json");-- string tokenContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ES.ES512-ComplexToken.txt");- string publicKeyContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ES.ES512-PublicKey.txt");-- _toolMode.Off();- _validateTokenSwitch.On();- _validateActorsSwitch.On();- _validateIssuersSwitch.On();- _validateIssuerSigningKeySwitch.On();- _validateAudiencesSwitch.On();- _tokenInput.Text(tokenContent);- _validateIssuersInput.Text("devtoys");- _validateAudiencesInput.Text("devtoys");- _publicKeyInput.Text(publicKeyContent);- await _decodeTool.WorkTask;- _infoBar.Description.Should().Be(JsonWebTokenEncoderDecoder.ValidToken);- _infoBar.Severity.Should().Be(UIInfoBarSeverity.Success);- _payloadInput.Text.Should().Be(payloadContent);- _headerInput.Text.Should().Be(headerContent);- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/EncodersDecoders/JsonWebToken/JsonWebTokenEncoderGuiToolTests.cs b/src/app/tests/DevToys.UnitTests/Tools/EncodersDecoders/JsonWebToken/JsonWebTokenEncoderGuiToolTests.csdeleted file mode 100644index cd66801e7..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/EncodersDecoders/JsonWebToken/JsonWebTokenEncoderGuiToolTests.cs+++ /dev/null@@ -1,213 +0,0 @@-using System.Globalization;-using System.Threading.Tasks;-using DevToys.Core.Tools.Metadata;-using DevToys.Tools.Tools.EncodersDecoders.JsonWebToken;--namespace DevToys.UnitTests.Tools.EncodersDecoders.JsonWebToken;--public sealed class JsonWebTokenEncoderGuiToolTests : MefBasedTest-{- private const string ToolName = "JsonWebTokenEncoderDecoder";- private const string BaseAssembly = "DevToys.UnitTests.Tools.TestData";-- private readonly JsonWebTokenEncoderGuiTool _encodeTool;- private readonly JsonWebTokenEncoderDecoderGuiTool _tool;- private readonly UIToolView _toolView;-- private readonly IUISwitch _toolMode;-- private readonly IUIInfoBar _infoBar;- private readonly IUISelectDropDownList _tokenAlgorithm;- private readonly IUIMultiLineTextInput _tokenInput;- private readonly IUIMultiLineTextInput _headerInput;- private readonly IUIMultiLineTextInput _payloadInput;- private readonly IUIMultiLineTextInput _signatureInput;- private readonly IUIMultiLineTextInput _privateKeyInput;-- private readonly IUISwitch _tokenIssuersSwitch;- private readonly IUISwitch _tokenAudiencesSwitch;- private readonly IUISingleLineTextInput _tokenIssuersInput;- private readonly IUISingleLineTextInput _tokenAudiencesInput;-- public JsonWebTokenEncoderGuiToolTests()- : base(typeof(JsonWebTokenEncoderGuiTool).Assembly)- {- _tool = (JsonWebTokenEncoderDecoderGuiTool)MefProvider.ImportMany<IGuiTool, GuiToolMetadata>()- .Single(t => t.Metadata.InternalComponentName == "JsonWebTokenEncoderDecoder")- .Value;-- _toolView = _tool.View;- _toolMode = (IUISwitch)_toolView.GetChildElementById("jwt-token-conversion-mode-switch");-- _encodeTool = _tool.EncoderGuiTool;- _infoBar = (IUIInfoBar)_toolView.GetChildElementById("jwt-encode-info-bar");-- var setting = (IUISetting)_toolView.GetChildElementById("jwt-encode-token-algorithm-setting");- _tokenAlgorithm = (IUISelectDropDownList)setting.InteractiveElement;- _tokenInput = (IUIMultiLineTextInput)_toolView.GetChildElementById("jwt-encode-token-input");- _headerInput = (IUIMultiLineTextInput)_toolView.GetChildElementById("jwt-encode-header-input");- _payloadInput = (IUIMultiLineTextInput)_toolView.GetChildElementById("jwt-encode-payload-input");- _signatureInput = (IUIMultiLineTextInput)_toolView.GetChildElementById("jwt-encode-signature-input");- _privateKeyInput = (IUIMultiLineTextInput)_toolView.GetChildElementById("jwt-encode-private-key-input");-- _tokenIssuersSwitch = (IUISwitch)_toolView.GetChildElementById("jwt-encode-token-issuer-switch");- _tokenAudiencesSwitch = (IUISwitch)_toolView.GetChildElementById("jwt-encode-token-audience-switch");- _tokenIssuersInput = (IUISingleLineTextInput)_toolView.GetChildElementById("jwt-encode-token-issuer-input");- _tokenAudiencesInput = (IUISingleLineTextInput)_toolView.GetChildElementById("jwt-encode-token-audience-input");-- CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture;- CultureInfo.CurrentCulture = CultureInfo.InvariantCulture;- }-- [Fact(DisplayName = "Encode Json Web Token with Invalid Payload should display error")]- public async Task EncodeTokenWithInvalidPayloadShouldDisplayError()- {- string headerContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.HS.HS256-Header.json");- _toolMode.On();- _payloadInput.Text("xxx");- await _encodeTool.WorkTask;- _tokenInput.Text.Should().BeEmpty();- _headerInput.Text.Should().Be(headerContent);- _infoBar.Description.Should().StartWith("'x' is an invalid start of a value.");- _infoBar.Severity.Should().Be(UIInfoBarSeverity.Error);- }-- [Fact(DisplayName = "Encode Json Web Token with Invalid Signature should display error")]- public async Task EncodeTokenWithInvalidSignatureShouldDisplayError()- {- string payloadContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.BasicPayload.json");- string headerContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.HS.HS256-Header.json");-- _toolMode.On();- _tokenAlgorithm.Select(0); // HS256- _tokenIssuersSwitch.Off();- _payloadInput.Text(payloadContent);- await _encodeTool.WorkTask;- _tokenInput.Text.Should().BeEmpty();- _headerInput.Text.Should().Be(headerContent);- _infoBar.Description.Should().Be(JsonWebTokenEncoderDecoder.InvalidSignature);- _infoBar.Severity.Should().Be(UIInfoBarSeverity.Error);- }-- [Fact(DisplayName = "Encode Json Web Token with Invalid Issuers should display error")]- public async Task EncodeTokenWithInvalidIssuersShouldDisplayError()- {- string payloadContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.BasicPayload.json");- string signatureContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.HS.HS256-Signature.txt");- string headerContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.HS.HS256-Header.json");-- _toolMode.On();- _tokenAlgorithm.Select(0); // HS256- _tokenIssuersSwitch.On();-- _payloadInput.Text(payloadContent);- _signatureInput.Text(signatureContent);- _tokenIssuersInput.Text(string.Empty);- await _encodeTool.WorkTask;- _tokenInput.Text.Should().BeEmpty();- _headerInput.Text.Should().Be(headerContent);- _infoBar.Description.Should().Be(JsonWebTokenEncoderDecoder.ValidIssuersEmptyError);- _infoBar.Severity.Should().Be(UIInfoBarSeverity.Error);- }-- [Fact(DisplayName = "Encode Json Web Token with Invalid Audiences should display error")]- public async Task EncodeTokenWithInvalidAudiencesShouldDisplayError()- {- string payloadContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.BasicPayload.json");- string signatureContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.HS.HS256-Signature.txt");- string headerContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.HS.HS256-Header.json");-- _toolMode.On();- _tokenAlgorithm.Select(0); // HS256- _tokenAudiencesSwitch.On();-- _payloadInput.Text(payloadContent);- _signatureInput.Text(signatureContent);- _tokenAudiencesInput.Text(string.Empty);- await _encodeTool.WorkTask;- _tokenInput.Text.Should().BeEmpty();- _headerInput.Text.Should().Be(headerContent);- _infoBar.Description.Should().Be(JsonWebTokenEncoderDecoder.ValidAudiencesEmptyError);- _infoBar.Severity.Should().Be(UIInfoBarSeverity.Error);- }-- [Fact(DisplayName = "Encode HS Json Web Token with Valid Payload and Valid Parameters should return token")]- public async Task EncodeHSTokenWithValidTokenAndValidParametersShouldReturnError()- {- string payloadContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ComplexPayload.json");- string signatureContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.HS.HS256-Signature.txt");- string headerContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.HS.HS256-Header.json");-- _toolMode.On();- _tokenAlgorithm.Select(0); // HS256- _tokenAudiencesSwitch.On();- _tokenAudiencesInput.Text("DevToys");- _tokenIssuersSwitch.On();- _tokenIssuersInput.Text("DevToys");- _payloadInput.Text(payloadContent);- _signatureInput.Text(signatureContent);- await _encodeTool.WorkTask;- _tokenInput.Text.Should().NotBeNullOrWhiteSpace();- _headerInput.Text.Should().Be(headerContent);- }-- [Fact(DisplayName = "Encode RS Json Web Token with Valid Payload and Valid Parameters should return token")]- public async Task EncodeRSTokenWithValidTokenAndValidParametersShouldReturnError()- {- string payloadContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ComplexPayload.json");- string privateKeyContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.RS.RS256-PrivateKey.txt");- string headerContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.RS.RS256-Header.json");-- _toolMode.On();- _tokenAlgorithm.Select(3); // RS256- _tokenAudiencesSwitch.On();- _tokenAudiencesInput.Text("DevToys");- _tokenIssuersSwitch.On();- _tokenIssuersInput.Text("DevToys");- _payloadInput.Text(payloadContent);- _privateKeyInput.Text(privateKeyContent);- await _encodeTool.WorkTask;- _tokenInput.Text.Should().NotBeNullOrWhiteSpace();- _headerInput.Text.Should().Be(headerContent);- }-- [Fact(DisplayName = "Encode PS Json Web Token with Valid Payload and Valid Parameters should return token")]- public async Task EncodePSTokenWithValidTokenAndValidParametersShouldReturnError()- {- string payloadContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ComplexPayload.json");- string privateKeyContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.PS.PS384-PrivateKey.txt");- string headerContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.PS.PS384-Header.json");-- _toolMode.On();- _tokenAlgorithm.Select(7); // PS384- _tokenAudiencesSwitch.On();- _tokenAudiencesInput.Text("DevToys");- _tokenIssuersSwitch.On();- _tokenIssuersInput.Text("DevToys");- _payloadInput.Text(payloadContent);- _privateKeyInput.Text(privateKeyContent);- await _encodeTool.WorkTask;- _tokenInput.Text.Should().NotBeNullOrWhiteSpace();- _headerInput.Text.Should().Be(headerContent);- }-- [Fact(DisplayName = "Encode ES Json Web Token with Valid Payload and Valid Parameters should return token")]- public async Task EncodeESTokenWithValidTokenAndValidParametersShouldReturnError()- {- string payloadContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ComplexPayload.json");- string privateKeyContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ES.ES512-PrivateKey.txt");- string headerContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ES.ES512-Header.json");-- _toolMode.On();- _tokenAlgorithm.Select(11); // ES512- _tokenAudiencesSwitch.On();- _tokenAudiencesInput.Text("DevToys");- _tokenIssuersSwitch.On();- _tokenIssuersInput.Text("DevToys");- _payloadInput.Text(payloadContent);- _privateKeyInput.Text(privateKeyContent);- await _encodeTool.WorkTask;- _tokenInput.Text.Should().NotBeNullOrWhiteSpace();- _headerInput.Text.Should().Be(headerContent);- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/EncodersDecoders/Url/UrlEncoderDecoderGuiToolTests.cs b/src/app/tests/DevToys.UnitTests/Tools/EncodersDecoders/Url/UrlEncoderDecoderGuiToolTests.csdeleted file mode 100644index 16a994b8b..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/EncodersDecoders/Url/UrlEncoderDecoderGuiToolTests.cs+++ /dev/null@@ -1,50 +0,0 @@-using System.Threading.Tasks;-using DevToys.Core.Tools.Metadata;-using DevToys.Tools.Tools.EncodersDecoders.Url;--namespace DevToys.UnitTests.Tools.EncodersDecoders.Url;--public sealed class UrlEncoderDecoderGuiToolTests : MefBasedTest-{- private readonly UrlEncoderDecoderGuiTool _tool;- private readonly UIToolView _toolView;- private readonly IUIMultiLineTextInput _inputBox;- private readonly IUIMultiLineTextInput _outputBox;-- public UrlEncoderDecoderGuiToolTests()- : base(typeof(UrlEncoderDecoderGuiTool).Assembly)- {- _tool = (UrlEncoderDecoderGuiTool)MefProvider.ImportMany<IGuiTool, GuiToolMetadata>()- .Single(t => t.Metadata.InternalComponentName == "UrlEncoderDecoder")- .Value;-- _toolView = _tool.View;-- _inputBox = (IUIMultiLineTextInput)_toolView.GetChildElementById("url-input-box");- _outputBox = (IUIMultiLineTextInput)_toolView.GetChildElementById("url-output-box");- }-- [Fact]- public async Task SwitchConversionMode()- {- var conversionMode = (IUISwitch)_toolView.GetChildElementById("url-conversion-mode-switch");-- _inputBox.Text("<hello world>");- await _tool.WorkTask;- _outputBox.Text.Should().Be("%3Chello%20world%3E");-- conversionMode.Off(); // Switch to Decode-- await _tool.WorkTask;- _inputBox.Text.Should().Be("%3Chello%20world%3E");- await _tool.WorkTask;- _outputBox.Text("<hello world>");-- conversionMode.On(); // Switch to Encode-- await _tool.WorkTask;- _inputBox.Text("<hello world>");- await _tool.WorkTask;- _outputBox.Text.Should().Be("%3Chello%20world%3E");- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Formatters/Json/JsonFormatterCommandLineToolTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Formatters/Json/JsonFormatterCommandLineToolTests.csdeleted file mode 100644index e6991c910..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Formatters/Json/JsonFormatterCommandLineToolTests.cs+++ /dev/null@@ -1,180 +0,0 @@-using System.IO;-using System.Threading.Tasks;-using DevToys.CLI;-using DevToys.Tools.Models;-using DevToys.Tools.Tools.Formatters.Json;-using Microsoft.Extensions.Logging;--namespace DevToys.UnitTests.Tools.Formatters.Json;--[Collection(nameof(TestParallelizationDisabled))]-public sealed class JsonFormatterCommandLineToolTests : MefBasedTest-{- private readonly StringWriter _consoleWriter = new();- private readonly StringWriter _consoleErrorWriter = new();- private readonly JsonFormatterCommandLineTool _tool;- private readonly Mock<ILogger> _loggerMock;- private readonly string _baseTestDataDirectory = Path.Combine("Tools", "TestData", "JsonYamlConverter");-- public JsonFormatterCommandLineToolTests()- : base(typeof(JsonFormatterCommandLineTool).Assembly)- {- _tool = (JsonFormatterCommandLineTool)MefProvider.ImportMany<ICommandLineTool, CommandLineToolMetadata>()- .Single(t => t.Metadata.InternalComponentName == "JsonFormatter").Value;-- _loggerMock = new Mock<ILogger>();- Console.SetOut(_consoleWriter);- Console.SetError(_consoleErrorWriter);- }-- [Theory(DisplayName = "Format with invalid input should return error exit code")]- [InlineData("")]- [InlineData(" ")]- public async Task FormatJsonInvalidInputShouldReturnErrorExitCode(string input)- {- _tool.Input = input;-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(-1);- string consoleOutput = _consoleErrorWriter.ToString().Trim();- consoleOutput.Should().Be("");- }-- [Fact(DisplayName = "Format json with invalid json should output invalid json error")]- public async Task FormatJsonInvalidJsonShouldOutputInvalidJsonError()- {- _tool.Input = " bar { \"foo\": 123 } ";-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(-1);- string consoleOutput = _consoleErrorWriter.ToString().Trim();- consoleOutput.Should().Be("Unexpected character encountered while parsing value: b. Path '', line 1, position 3.");- }-- [Theory(DisplayName = "Format json with valid json and two spaces indentation should output valid json")]- [InlineData(true, "{\r\n \"a\": \"asdf\",\r\n \"array\": [\r\n {\r\n \"a\": \"asdf\",\r\n \"array\": [],\r\n \"b\": 33,\r\n \"c\": 545\r\n }\r\n ],\r\n \"b\": 33,\r\n \"c\": 545\r\n}")]- [InlineData(false, "{\r\n \"a\": \"asdf\",\r\n \"c\": 545,\r\n \"b\": 33,\r\n \"array\": [\r\n {\r\n \"a\": \"asdf\",\r\n \"c\": 545,\r\n \"b\": 33,\r\n \"array\": []\r\n }\r\n ]\r\n}")]- public async Task FormatJsonWithValidJsonAndTwoSpacesShouldOutputValidJson(bool sortProperties, string expectedResult)- {- expectedResult = expectedResult.Replace("\r\n", Environment.NewLine);- _tool.SortProperties = sortProperties;- _tool.Input = "{\"a\": \"asdf\", \"c\" : 545, \"b\": 33, \"array\": [{\"a\": \"asdf\", \"c\" : 545, \"b\": 33, \"array\": []}]}";-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(0);- string consoleOutput = _consoleWriter.ToString().Trim();- consoleOutput.Should().Be(expectedResult);- }-- [Theory(DisplayName = "Format json with valid json and four spaces indentation should output valid json")]- [InlineData(true, "{\r\n \"a\": \"asdf\",\r\n \"array\": [\r\n {\r\n \"a\": \"asdf\",\r\n \"array\": [],\r\n \"b\": 33,\r\n \"c\": 545\r\n }\r\n ],\r\n \"b\": 33,\r\n \"c\": 545\r\n}")]- [InlineData(false, "{\r\n \"a\": \"asdf\",\r\n \"c\": 545,\r\n \"b\": 33,\r\n \"array\": [\r\n {\r\n \"a\": \"asdf\",\r\n \"c\": 545,\r\n \"b\": 33,\r\n \"array\": []\r\n }\r\n ]\r\n}")]- public async Task FormatJsonWithValidJsonAndFourSpacesShouldOutputValidJson(bool sortProperties, string expectedResult)- {- expectedResult = expectedResult.Replace("\r\n", Environment.NewLine);- _tool.IndentationMode = Indentation.FourSpaces;- _tool.SortProperties = sortProperties;- _tool.Input = "{\"a\": \"asdf\", \"c\" : 545, \"b\": 33, \"array\": [{\"a\": \"asdf\", \"c\" : 545, \"b\": 33, \"array\": []}]}";-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(0);- string consoleOutput = _consoleWriter.ToString().Trim();- consoleOutput.Should().Be(expectedResult);- }-- [Theory(DisplayName = "Format json with valid json and one tab indentation should output valid json")]- [InlineData(true, "{\r\n\t\"a\": \"asdf\",\r\n\t\"array\": [\r\n\t\t{\r\n\t\t\t\"a\": \"asdf\",\r\n\t\t\t\"array\": [],\r\n\t\t\t\"b\": 33,\r\n\t\t\t\"c\": 545\r\n\t\t}\r\n\t],\r\n\t\"b\": 33,\r\n\t\"c\": 545\r\n}")]- [InlineData(false, "{\r\n\t\"a\": \"asdf\",\r\n\t\"c\": 545,\r\n\t\"b\": 33,\r\n\t\"array\": [\r\n\t\t{\r\n\t\t\t\"a\": \"asdf\",\r\n\t\t\t\"c\": 545,\r\n\t\t\t\"b\": 33,\r\n\t\t\t\"array\": []\r\n\t\t}\r\n\t]\r\n}")]- public async Task FormatJsonWithValidJsonAndOneTabShouldOutputValidJson(bool sortProperties, string expectedResult)- {- expectedResult = expectedResult.Replace("\r\n", Environment.NewLine);- _tool.IndentationMode = Indentation.OneTab;- _tool.SortProperties = sortProperties;- _tool.Input = "{\"a\": \"asdf\", \"c\" : 545, \"b\": 33, \"array\": [{\"a\": \"asdf\", \"c\" : 545, \"b\": 33, \"array\": []}]}";-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(0);- string consoleOutput = _consoleWriter.ToString().Trim();- consoleOutput.Should().Be(expectedResult);- }-- [Theory(DisplayName = "Format json with valid json and minified indentation should output valid json")]- [InlineData(true, "{\"a\":\"asdf\",\"array\":[{\"a\":\"asdf\",\"array\":[],\"b\":33,\"c\":545}],\"b\":33,\"c\":545}")]- [InlineData(false, "{\"a\":\"asdf\",\"c\":545,\"b\":33,\"array\":[{\"a\":\"asdf\",\"c\":545,\"b\":33,\"array\":[]}]}")]- public async Task FormatJsonWithValidJsonAndMinifiedShouldOutputValidJson(bool sortProperties, string expectedResult)- {- _tool.IndentationMode = Indentation.Minified;- _tool.SortProperties = sortProperties;- _tool.Input = "{\"a\": \"asdf\", \"c\" : 545, \"b\": 33, \"array\": [{\"a\": \"asdf\", \"c\" : 545, \"b\": 33, \"array\": []}]}";-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(0);- string consoleOutput = _consoleWriter.ToString().Trim();- consoleOutput.Should().Be(expectedResult);- }-- [Fact(DisplayName = "Format json with unknown json file should output invalid json error")]- public async Task FormatJsonWithUnknownFileInputShouldReturnErrorExitCode()- {- string filePath = Path.Combine(_baseTestDataDirectory, "Unknown.json");- FileInfo inputFile = TestDataProvider.GetFile(filePath);- _tool.Input = inputFile;- _tool.OutputFile = new FileInfo("Dummy.json");- ((MockIFileStorage)MefProvider.Import<IFileStorage>()).FileExistsResult = false;-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(-1);- string consoleOutput = _consoleErrorWriter.ToString().Trim();- consoleOutput.Should().Be(JsonFormatter.InputFileNotFound);- }-- [Fact(DisplayName = "Format json with valid json file and two spaces indentation should output valid json file")]- public async Task FormatJsonWithValidFileInputAndTwoSpacesShouldOutputValidJsonFile()- {- string expectedFilePath = Path.Combine(_baseTestDataDirectory, "TwoSpaces.json");- string expectedContent = File.ReadAllText(expectedFilePath);-- string filePath = Path.Combine(_baseTestDataDirectory, "FourSpaces.json");- FileInfo inputFile = TestDataProvider.GetFile(filePath);- _tool.Input = inputFile;- _tool.OutputFile = new FileInfo("OutputTwoSpaces.json");-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(0);- string outputContent = File.ReadAllText(_tool.OutputFile.FullName);- outputContent.Should().Be(expectedContent);- }-- [Fact(DisplayName = "Format json with valid json file and four spaces indentation should output valid json file")]- public async Task FormatJsonWithValidFileInputAndFourSpacesShouldOutputValidJsonFile()- {- string expectedFilePath = Path.Combine(_baseTestDataDirectory, "FourSpaces.json");- string expectedContent = File.ReadAllText(expectedFilePath);-- string filePath = Path.Combine(_baseTestDataDirectory, "TwoSpaces.json");- FileInfo inputFile = TestDataProvider.GetFile(filePath);- _tool.Input = inputFile;- _tool.IndentationMode = Indentation.FourSpaces;- _tool.OutputFile = new FileInfo("OutputFourSpaces.json");-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(0);- string outputContent = File.ReadAllText(_tool.OutputFile.FullName);- outputContent.Should().Be(expectedContent);- }-- [Fact(DisplayName = "Format json with json file containing invalid json should output invalid json error")]- public async Task FormatJsonWithFileInputWithInvalidJsonShouldOutputInvalidJsonError()- {- string filePath = Path.Combine(_baseTestDataDirectory, "Invalid.json");- FileInfo inputFile = TestDataProvider.GetFile(filePath);- _tool.Input = inputFile;- _tool.IndentationMode = Indentation.OneTab;- _tool.OutputFile = new FileInfo("OutputOneTab.json");-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(-1);- string consoleOutput = _consoleErrorWriter.ToString().Trim();- consoleOutput.Should().Be("Unexpected character encountered while parsing value: b. Path '', line 1, position 3.");- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Formatters/Json/JsonFormatterGuiToolTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Formatters/Json/JsonFormatterGuiToolTests.csdeleted file mode 100644index 30c0291dc..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Formatters/Json/JsonFormatterGuiToolTests.cs+++ /dev/null@@ -1,127 +0,0 @@-using System.Globalization;-using System.Threading.Tasks;-using DevToys.Core.Tools.Metadata;-using DevToys.Tools.Tools.Formatters.Json;--namespace DevToys.UnitTests.Tools.Formatters.Json;--public class JsonFormatterGuiToolTests : MefBasedTest-{- private readonly UIToolView _toolView;- private readonly JsonFormatterGuiTool _tool;- private readonly IUIMultiLineTextInput _inputTextArea;- private readonly IUIMultiLineTextInput _outputTextArea;-- public JsonFormatterGuiToolTests()- : base(typeof(JsonFormatterGuiTool).Assembly)- {- _tool = (JsonFormatterGuiTool)MefProvider.ImportMany<IGuiTool, GuiToolMetadata>()- .Single(t => t.Metadata.InternalComponentName == "JsonFormatter")- .Value;-- _toolView = _tool.View;-- _inputTextArea = (IUIMultiLineTextInput)_toolView.GetChildElementById("json-input-text-area");- _outputTextArea = (IUIMultiLineTextInput)_toolView.GetChildElementById("json-output-text-area");- CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture;- CultureInfo.CurrentCulture = CultureInfo.InvariantCulture;- }-- [Theory(DisplayName = "Format json with invalid json should return empty string")]- [InlineData(null)]- [InlineData("")]- [InlineData(" ")]- public async Task FormatJsonWithInvalidJsonShouldReturnJsonError(string input)- {- _inputTextArea.Text("abc");- _inputTextArea.Text(input);- await _tool.WorkTask;- _outputTextArea.Text.Should().Be("");- }-- [Fact(DisplayName = "Format json with invalid json should return json exception message")]- public async Task FormatJsonWithInvalidJsonShouldReturnJsonExceptionMessage()- {- _inputTextArea.Text(" bar { \"foo\": 123 } ");- await _tool.WorkTask;- _outputTextArea.Text.Should().Be("Unexpected character encountered while parsing value: b. Path '', line 1, position 3.");- }-- [Fact(DisplayName = "Format json with valid json and two spaces indentation should return valid json")]- public async Task FormatJsonWithValidJsonAndTwoSpacesShouldReturnValidJson()- {- _inputTextArea.Text("{ \"foo\": 123 }");-- var indentationOptions = (IUISelectDropDownList)((IUISetting)_toolView.GetChildElementById("json-text-indentation-setting")).InteractiveElement;- indentationOptions.Select(0); // Select TwoSpaces-- await _tool.WorkTask;-- string expectedResult = "{\r\n \"foo\": 123\r\n}";- expectedResult = expectedResult.Replace("\r\n", Environment.NewLine);- _outputTextArea.Text.Should().Be(expectedResult);- }-- [Fact(DisplayName = "Format json with valid json and four spaces indentation should return valid json")]- public async Task FormatJsonWithValidJsonAndFourSpacesShouldReturnValidJson()- {- _inputTextArea.Text("{ \"foo\": 123 }");-- var indentationOptions = (IUISelectDropDownList)((IUISetting)_toolView.GetChildElementById("json-text-indentation-setting")).InteractiveElement;- indentationOptions.Select(1); // Select FourSpaces-- await _tool.WorkTask;- string expectedResult = "{\r\n \"foo\": 123\r\n}";- expectedResult = expectedResult.Replace("\r\n", Environment.NewLine);- _outputTextArea.Text.Should().Be(expectedResult);- }-- [Fact(DisplayName = "Format json with valid json and one tab indentation should return valid json")]- public async Task FormatJsonWithValidJsonAndOneTabShouldReturnValidJson()- {- _inputTextArea.Text("{ \"foo\": 123 }");-- var indentationOptions = (IUISelectDropDownList)((IUISetting)_toolView.GetChildElementById("json-text-indentation-setting")).InteractiveElement;- indentationOptions.Select(2); // Select OneTab-- await _tool.WorkTask;- string expectedResult = "{\r\n\t\"foo\": 123\r\n}";- expectedResult = expectedResult.Replace("\r\n", Environment.NewLine);- _outputTextArea.Text.Should().Be(expectedResult);- }-- [Fact(DisplayName = "Format json with valid json and minified should return valid json")]- public async Task FormatJsonWithValidJsonAndMinifiedShouldReturnValidJson()- {- _inputTextArea.Text("{ \"foo\": 123 }");-- var indentationOptions = (IUISelectDropDownList)((IUISetting)_toolView.GetChildElementById("json-text-indentation-setting")).InteractiveElement;- indentationOptions.Select(3); // Select Minified-- await _tool.WorkTask;- _outputTextArea.Text.Should().Be("{\"foo\":123}");- }-- [Fact(DisplayName = "Format json with valid json and sort properties should return valid json")]- public async Task FormatJsonWithValidJsonAndSortPropertiesShouldReturnValidJson()- {- _inputTextArea.Text("{\"a\": \"asdf\", \"c\" : 545, \"b\": 33, \"array\": [{\"a\": \"asdf\", \"c\" : 545, \"b\": 33, \"array\": []}]}");- var indentationOptions = (IUISelectDropDownList)((IUISetting)_toolView.GetChildElementById("json-text-indentation-setting")).InteractiveElement;- indentationOptions.Select(0); // Select TwoSpaces-- var newLineOnAttributesOptions = (IUISwitch)((IUISetting)_toolView.GetChildElementById("json-text-sortProperties-setting")).InteractiveElement;- newLineOnAttributesOptions.On();-- await _tool.WorkTask;- string expectedResult = "{\r\n \"a\": \"asdf\",\r\n \"array\": [\r\n {\r\n \"a\": \"asdf\",\r\n \"array\": [],\r\n \"b\": 33,\r\n \"c\": 545\r\n }\r\n ],\r\n \"b\": 33,\r\n \"c\": 545\r\n}";- expectedResult = expectedResult.Replace("\r\n", Environment.NewLine);- _outputTextArea.Text.Should().Be(expectedResult);-- newLineOnAttributesOptions.Off();-- await _tool.WorkTask;- expectedResult = "{\r\n \"a\": \"asdf\",\r\n \"c\": 545,\r\n \"b\": 33,\r\n \"array\": [\r\n {\r\n \"a\": \"asdf\",\r\n \"c\": 545,\r\n \"b\": 33,\r\n \"array\": []\r\n }\r\n ]\r\n}";- expectedResult = expectedResult.Replace("\r\n", Environment.NewLine);- _outputTextArea.Text.Should().Be(expectedResult);- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Formatters/Sql/SqlFormatterCommandLineToolTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Formatters/Sql/SqlFormatterCommandLineToolTests.csdeleted file mode 100644index 10db7c518..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Formatters/Sql/SqlFormatterCommandLineToolTests.cs+++ /dev/null@@ -1,140 +0,0 @@-using System.IO;-using System.Threading.Tasks;-using DevToys.CLI;-using DevToys.Tools.Helpers.SqlFormatter;-using DevToys.Tools.Models;-using DevToys.Tools.Tools.Formatters.Sql;-using Microsoft.Extensions.Logging;--namespace DevToys.UnitTests.Tools.Formatters.Sql;--[Collection(nameof(TestParallelizationDisabled))]-public class SqlFormatterCommandLineToolTests : MefBasedTest-{- private readonly StringWriter _consoleWriter = new();- private readonly StringWriter _consoleErrorWriter = new();- private readonly SqlFormatterCommandLineTool _tool;- private readonly Mock<ILogger> _loggerMock;- private readonly string _baseTestDataDirectory = Path.Combine("Tools", "TestData", "Sql");-- public SqlFormatterCommandLineToolTests()- : base(typeof(SqlFormatterCommandLineTool).Assembly)- {- _tool = (SqlFormatterCommandLineTool)MefProvider.ImportMany<ICommandLineTool, CommandLineToolMetadata>()- .Single(t => t.Metadata.InternalComponentName == "SqlFormatter").Value;-- _loggerMock = new Mock<ILogger>();- Console.SetOut(_consoleWriter);- Console.SetError(_consoleErrorWriter);- }-- [Theory(DisplayName = "Format with invalid input should return error exit code")]- [InlineData("")]- [InlineData(" ")]- public async Task FormatSqlInvalidInputShouldReturnErrorExitCode(string input)- {- _tool.Input = input;-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(-1);- string consoleOutput = _consoleErrorWriter.ToString().Trim();- consoleOutput.Should().Be("");- }-- [Theory(DisplayName = "Format sql with valid standard sql should output valid sql")]- [InlineData(SqlLanguage.Sql, "SELECT * FETCH FIRST 2 ROWS ONLY;", @"SELECT- *-FETCH FIRST- 2 ROWS ONLY;")]- [InlineData(SqlLanguage.N1ql, "SELECT order_lines[0].productId FROM orders;", @"SELECT- order_lines[0].productId-FROM- orders;")]- public async Task FormatSqlWithValidSqlAndTwoSpacesShouldOutputValidSql(SqlLanguage language, string input, string expectedResult)- {- _tool.Input = input;- _tool.SqlLanguage = language;-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(0);- string consoleOutput = _consoleWriter.ToString().Trim();- consoleOutput.Should().Be(expectedResult);- }-- [Theory(DisplayName = "Format sql with valid standard sql should output valid sql")]- [InlineData(SqlLanguage.Sql, "SELECT * FETCH FIRST 2 ROWS ONLY;", @"SELECT- *-FETCH FIRST- 2 ROWS ONLY;")]- [InlineData(SqlLanguage.Tsql, "INSERT Customers (ID, MoneyBalance, Address, City) VALUES (12,-123.4, 'Skagen 2111','Stv');", @"INSERT- Customers (ID, MoneyBalance, Address, City)-VALUES- (12, -123.4, 'Skagen 2111', 'Stv');")]- public async Task FormatSqlWithValidSqlAndFourSpacesShouldOutputValidSql(SqlLanguage language, string input, string expectedResult)- {- _tool.Input = input;- _tool.SqlLanguage = language;- _tool.IndentationMode = Indentation.FourSpaces;-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(0);- string consoleOutput = _consoleWriter.ToString().Trim();- consoleOutput.Should().Be(expectedResult);- }-- [Theory(DisplayName = "Format sql with valid standard sql should output valid sql")]- [InlineData(SqlLanguage.Sql, "SELECT * FETCH FIRST 2 ROWS ONLY;", "SELECT\r\n\t*\r\nFETCH FIRST\r\n\t2 ROWS ONLY;")]- [InlineData(SqlLanguage.Db2, "SELECT col1 FROM tbl ORDER BY col2 DESC FETCH FIRST 20 ROWS ONLY;", "SELECT\r\n\tcol1\r\nFROM\r\n\ttbl\r\nORDER BY\r\n\tcol2 DESC\r\nFETCH FIRST\r\n\t20 ROWS ONLY;")]- public async Task FormatSqlWithValidSqlAndTabShouldOutputValidSql(SqlLanguage language, string input, string expectedResult)- {- expectedResult = expectedResult.Replace("\r\n", Environment.NewLine);- _tool.Input = input;- _tool.SqlLanguage = language;- _tool.IndentationMode = Indentation.OneTab;-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(0);- string consoleOutput = _consoleWriter.ToString().Trim();- consoleOutput.Should().Be(expectedResult);- }-- [Theory(DisplayName = "Format sql with valid sql and use leading comma should return valid sql")]- [InlineData("SELECT column1, column2 FROM table", """-SELECT- column1- , column2-FROM- TABLE-""")]- public async Task FormatSqlWithValidSqlAndUseLeadingCommaShouldReturnValidSql(string input, string expectedResult)- {- _tool.Input = input;- _tool.UseLeadingComma = true;-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);-- result.Should().Be(0);- string consoleOutput = _consoleWriter.ToString().Trim();- consoleOutput.Should().Be(expectedResult);- }-- [Theory(DisplayName = "Format sql with valid sql and without leading comma should return valid sql")]- [InlineData("SELECT column1, column2 FROM table", """-SELECT- column1,- column2-FROM- TABLE-""")]- public async Task FormatSqlWithValidSqlAndWithoutLeadingCommaShouldReturnValidSql(string input, string expectedResult)- {- _tool.Input = input;- _tool.UseLeadingComma = false;-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);-- result.Should().Be(0);- string consoleOutput = _consoleWriter.ToString().Trim();- consoleOutput.Should().Be(expectedResult);- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Formatters/Sql/SqlFormatterGuiToolTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Formatters/Sql/SqlFormatterGuiToolTests.csdeleted file mode 100644index 6b8ffa081..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Formatters/Sql/SqlFormatterGuiToolTests.cs+++ /dev/null@@ -1,119 +0,0 @@-using System.Globalization;-using System.Threading.Tasks;-using DevToys.Core.Tools.Metadata;-using DevToys.Tools.Tools.Formatters.Sql;--namespace DevToys.UnitTests.Tools.Formatters.Sql;--public class SqlFormatterGuiToolTests : MefBasedTest-{- private readonly UIToolView _toolView;- private readonly SqlFormatterGuiTool _tool;- private readonly IUIMultiLineTextInput _inputTextArea;- private readonly IUIMultiLineTextInput _outputTextArea;-- public SqlFormatterGuiToolTests()- : base(typeof(SqlFormatterGuiTool).Assembly)- {- _tool = (SqlFormatterGuiTool)MefProvider.ImportMany<IGuiTool, GuiToolMetadata>()- .Single(t => t.Metadata.InternalComponentName == "SqlFormatter")- .Value;-- _toolView = _tool.View;-- _inputTextArea = (IUIMultiLineTextInput)_toolView.GetChildElementById("sql-input-text-area");- _outputTextArea = (IUIMultiLineTextInput)_toolView.GetChildElementById("sql-output-text-area");- CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture;- CultureInfo.CurrentCulture = CultureInfo.InvariantCulture;- }-- [Theory(DisplayName = "Format sql with invalid sql should return empty string")]- [InlineData(null)]- [InlineData("")]- [InlineData(" ")]- public async Task FormatSqlWithInvalidSqlShouldReturnSqlError(string input)- {- _inputTextArea.Text("abc");- _inputTextArea.Text(input);- await _tool.WorkTask;- _outputTextArea.Text.Should().Be("");- }-- [Fact(DisplayName = "Format sql with valid sql and two spaces indentation should return valid sql")]- public async Task FormatSqlWithValidSqlAndTwoSpacesShouldReturnValidSql()- {- _inputTextArea.Text("SELECT * FETCH FIRST 2 ROWS ONLY;");-- var indentationOptions = (IUISelectDropDownList)((IUISetting)_toolView.GetChildElementById("sql-text-indentation-setting")).InteractiveElement;- indentationOptions.Select(0); // Select TwoSpaces-- await _tool.WorkTask;- _outputTextArea.Text.Should().Be(@"SELECT- *-FETCH FIRST- 2 ROWS ONLY;");- }-- [Fact(DisplayName = "Format sql with valid sql and four spaces indentation should return valid sql")]- public async Task FormatSqlWithValidSqlAndFourSpacesShouldReturnValidSql()- {- _inputTextArea.Text("SELECT * FETCH FIRST 2 ROWS ONLY;");-- var indentationOptions = (IUISelectDropDownList)((IUISetting)_toolView.GetChildElementById("sql-text-indentation-setting")).InteractiveElement;- indentationOptions.Select(1); // Select FourSpaces-- await _tool.WorkTask;- _outputTextArea.Text.Should().Be(@"SELECT- *-FETCH FIRST- 2 ROWS ONLY;");- }-- [Fact(DisplayName = "Format sql with valid sql and one tab indentation should return valid sql")]- public async Task FormatSqlWithValidSqlAndOneTabShouldReturnValidSql()- {- _inputTextArea.Text("SELECT * FETCH FIRST 2 ROWS ONLY;");-- var indentationOptions = (IUISelectDropDownList)((IUISetting)_toolView.GetChildElementById("sql-text-indentation-setting")).InteractiveElement;- indentationOptions.Select(2); // Select OneTab-- await _tool.WorkTask;- _outputTextArea.Text.Should().Be("SELECT\r\n\t*\r\nFETCH FIRST\r\n\t2 ROWS ONLY;".Replace("\r\n", Environment.NewLine));- }-- [Fact(DisplayName = "Format sql with valid sql and use leading comma should return valid sql")]- public async Task FormatSqlWithValidSqlAndUseLeadingCommaShouldReturnValidSql()- {- _inputTextArea.Text("SELECT column1, column2 FROM table");-- var leadingCommaSetting = (IUISwitch)((IUISetting)_toolView.GetChildElementById("sql-leading-comma-setting")).InteractiveElement;- leadingCommaSetting.On();-- await _tool.WorkTask;- _outputTextArea.Text.Should().Be("""-SELECT- column1- , column2-FROM- TABLE-""");- }-- [Fact(DisplayName = "Format sql with valid sql and without leading comma should return valid sql")]- public async Task FormatSqlWithValidSqlAndWithoutLeadingCommaShouldReturnValidSql()- {- _inputTextArea.Text("SELECT column1, column2 FROM table");-- var leadingCommaSetting = (IUISwitch)((IUISetting)_toolView.GetChildElementById("sql-leading-comma-setting")).InteractiveElement;- leadingCommaSetting.Off();-- await _tool.WorkTask;- _outputTextArea.Text.Should().Be("""-SELECT- column1,- column2-FROM- TABLE-""");- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Formatters/Sql/SqlFormatterTestHelpers.cs b/src/app/tests/DevToys.UnitTests/Tools/Formatters/Sql/SqlFormatterTestHelpers.csdeleted file mode 100644index 9c0d8c07d..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Formatters/Sql/SqlFormatterTestHelpers.cs+++ /dev/null@@ -1,1051 +0,0 @@-using System.Text.RegularExpressions;-using DevToys.Tools.Helpers.SqlFormatter.Core;-using DevToys.Tools.Helpers.SqlFormatter;-using Indentation = DevToys.Tools.Models.Indentation;--namespace DevToys.UnitTests.Tools.Formatters.Sql;-internal static class SqlFormatterTestHelpers-{- /// <summary>- /// Core tests for all SQL formatters- /// </summary>- internal static void BehavesLikeSqlFormatter(Formatter formatter)- {- SupportsComments(formatter);- SupportsConfigOptions(formatter);- SupportsOperators(formatter, "=", "+", "-", "*", "/", "<>", ">", "<", ">=", "<=");-- // does nothing with empty input- string input = string.Empty;- string expectedResult = string.Empty;- string output = formatter.Format(input);- output.Should().Be(expectedResult);-- // formats lonely semicolon- input = ";";- expectedResult = ";";- AssertFormat(formatter, input, expectedResult);-- // formats simple SELECT query- input = "SELECT count(*),Column1 FROM Table1;";- expectedResult =-@"SELECT- count(*),- Column1-FROM- Table1;";- AssertFormat(formatter, input, expectedResult);-- // formats complex SELECT- input = "SELECT DISTINCT name, ROUND(age/7) field1, 18 + 20 AS field2, 'some string' FROM foo;";- expectedResult =-@"SELECT- DISTINCT name,- ROUND(age / 7) field1,- 18 + 20 AS field2,- 'some string'-FROM- foo;";- AssertFormat(formatter, input, expectedResult);-- // formats SELECT with complex WHERE- input =-@"SELECT * FROM foo WHERE Column1 = 'testing'-AND ( (Column2 = Column3 OR Column4 >= NOW()) );";- expectedResult =-@"SELECT- *-FROM- foo-WHERE- Column1 = 'testing'- AND (- (- Column2 = Column3- OR Column4 >= NOW()- )- );";- AssertFormat(formatter, input, expectedResult);-- // formats SELECT with top level reserved words- input =-@"SELECT * FROM foo WHERE name = 'John' GROUP BY some_column-HAVING column > 10 ORDER BY other_column LIMIT 5;";- expectedResult =-@"SELECT- *-FROM- foo-WHERE- name = 'John'-GROUP BY- some_column-HAVING- column > 10-ORDER BY- other_column-LIMIT- 5;";- AssertFormat(formatter, input, expectedResult);-- // formats LIMIT with two comma-separated values on single line- input = @"LIMIT 5, 10;";- expectedResult =-@"LIMIT- 5, 10;";- AssertFormat(formatter, input, expectedResult);-- // formats LIMIT of single value followed by another SELECT using commas- input = @"LIMIT 5; SELECT foo, bar;";- expectedResult =-@"LIMIT- 5;-SELECT- foo,- bar;";- AssertFormat(formatter, input, expectedResult);-- // formats LIMIT of single value and OFFSET- input = @"LIMIT 5 OFFSET 8;";- expectedResult =-@"LIMIT- 5 OFFSET 8;";- AssertFormat(formatter, input, expectedResult);-- // recognizes LIMIT in lowercase- input = @"limit 5, 10;";- expectedResult =-@"limit- 5, 10;";- AssertFormat(formatter, input, expectedResult);-- // preserves case of keywords- input = @"select distinct * frOM foo WHERe a > 1 and b = 3";- expectedResult =-@"select- distinct *-frOM- foo-WHERe- a > 1- and b = 3";- AssertFormat(formatter, input, expectedResult);-- // formats SELECT query with SELECT query inside it- input = @"SELECT *, SUM(*) AS sum FROM (SELECT * FROM Posts LIMIT 30) WHERE a > b";- expectedResult =-@"SELECT- *,- SUM(*) AS sum-FROM- (- SELECT- *- FROM- Posts- LIMIT- 30- )-WHERE- a > b";- AssertFormat(formatter, input, expectedResult);-- // formats simple INSERT query- input = @"INSERT INTO Customers (ID, MoneyBalance, Address, City) VALUES (12,-123.4, 'Skagen 2111','Stv');";- expectedResult =-@"INSERT INTO- Customers (ID, MoneyBalance, Address, City)-VALUES- (12, -123.4, 'Skagen 2111', 'Stv');";- AssertFormat(formatter, input, expectedResult);-- // formats open paren after comma- input = @"WITH TestIds AS (VALUES (4),(5), (6),(7),(9),(10),(11)) SELECT * FROM TestIds;";- expectedResult =-@"WITH TestIds AS (- VALUES- (4),- (5),- (6),- (7),- (9),- (10),- (11)-)-SELECT- *-FROM- TestIds;";- AssertFormat(formatter, input, expectedResult);-- // keeps short parenthesized list with nested parenthesis on single line- input = @"SELECT (a + b * (c - NOW()));";- expectedResult =-@"SELECT- (a + b * (c - NOW()));";- AssertFormat(formatter, input, expectedResult);-- // breaks long parenthesized lists to multiple lines- input =-@"INSERT INTO some_table (id_product, id_shop, id_currency, id_country, id_registration) (-SELECT IF(dq.id_discounter_shopping = 2, dq.value, dq.value / 100),-IF (dq.id_discounter_shopping = 2, 'amount', 'percentage') FROM foo);";- expectedResult =-@"INSERT INTO- some_table (- id_product,- id_shop,- id_currency,- id_country,- id_registration- ) (- SELECT- IF(- dq.id_discounter_shopping = 2,- dq.value,- dq.value / 100- ),- IF (- dq.id_discounter_shopping = 2,- 'amount',- 'percentage'- )- FROM- foo- );";- AssertFormat(formatter, input, expectedResult);-- // formats simple UPDATE query- input = @"UPDATE Customers SET ContactName='Alfred Schmidt', City='Hamburg' WHERE CustomerName='Alfreds Futterkiste';";- expectedResult =-@"UPDATE- Customers-SET- ContactName = 'Alfred Schmidt',- City = 'Hamburg'-WHERE- CustomerName = 'Alfreds Futterkiste';";- AssertFormat(formatter, input, expectedResult);-- // formats simple DELETE query- input = @"DELETE FROM Customers WHERE CustomerName='Alfred' AND Phone=5002132;";- expectedResult =-@"DELETE FROM- Customers-WHERE- CustomerName = 'Alfred'- AND Phone = 5002132;";- AssertFormat(formatter, input, expectedResult);-- // formats simple DROP query- input = @"DROP TABLE IF EXISTS admin_role;";- expectedResult = @"DROP TABLE IF EXISTS admin_role;";- AssertFormat(formatter, input, expectedResult);-- // formats incomplete query- input = @"SELECT count(";- expectedResult =-@"SELECT- count(";- AssertFormat(formatter, input, expectedResult);-- // formats UPDATE query with AS part- input = @"UPDATE customers SET total_orders = order_summary.total FROM ( SELECT * FROM bank) AS order_summary";- expectedResult =-@"UPDATE- customers-SET- total_orders = order_summary.total-FROM- (- SELECT- *- FROM- bank- ) AS order_summary";- AssertFormat(formatter, input, expectedResult);-- // formats top-level and newline multi-word reserved words with inconsistent spacing- input = "SELECT * FROM foo LEFT \t \r\n JOIN bar ORDER \r\n BY blah";- expectedResult = "SELECT\r\n *\r\nFROM\r\n foo\r\n LEFT \t \r\n JOIN bar\r\nORDER \r\n BY\r\n blah";- AssertFormat(formatter, input, expectedResult);-- // formats long double parenthized queries to multiple lines- input = @"((foo = '0123456789-0123456789-0123456789-0123456789'))";- expectedResult =-@"(- (- foo = '0123456789-0123456789-0123456789-0123456789'- )-)";- AssertFormat(formatter, input, expectedResult);-- // formats short double parenthized queries to one line- input = @"((foo = 'bar'))";- expectedResult = @"((foo = 'bar'))";- AssertFormat(formatter, input, expectedResult);-- // formats logical operators- AssertFormat(formatter, @"foo ALL bar", @"foo ALL bar");- AssertFormat(formatter, @"foo = ANY (1, 2, 3)", @"foo = ANY (1, 2, 3)");- AssertFormat(formatter, @"EXISTS bar", @"EXISTS bar");- AssertFormat(formatter, @"foo IN (1, 2, 3)", @"foo IN (1, 2, 3)");- AssertFormat(formatter, @"foo LIKE 'hello%'", @"foo LIKE 'hello%'");- AssertFormat(formatter, @"foo IS NULL", @"foo IS NULL");- AssertFormat(formatter, @"UNIQUE foo", @"UNIQUE foo");-- // formats AND/OR operators- AssertFormat(formatter, "foo AND bar", "foo\r\nAND bar");- AssertFormat(formatter, "foo OR bar", "foo\r\nOR bar");-- // keeps separation between multiple statements- AssertFormat(formatter, "foo;bar;", "foo;\r\nbar;");- AssertFormat(formatter, "foo\r\n;bar;", "foo;\r\nbar;");- AssertFormat(formatter, "foo\n\n\n;bar;\n\n", "foo;\r\nbar;");- input =-@"SELECT count(*),Column1 FROM Table1;-SELECT count(*),Column1 FROM Table2;";- expectedResult =-@"SELECT- count(*),- Column1-FROM- Table1;-SELECT- count(*),- Column1-FROM- Table2;";- AssertFormat(formatter, input, expectedResult);-- // formats unicode correctly- input = @"SELECT 结合使用, тест FROM table;";- expectedResult =-@"SELECT- 结合使用,- тест-FROM- table;";- AssertFormat(formatter, input, expectedResult);-- // correctly indents create statement after select- input =-@"SELECT * FROM test;-CREATE TABLE TEST(id NUMBER NOT NULL, col1 VARCHAR2(20), col2 VARCHAR2(20));";- expectedResult =-@"SELECT- *-FROM- test;-CREATE TABLE TEST(- id NUMBER NOT NULL,- col1 VARCHAR2(20),- col2 VARCHAR2(20)-);";- AssertFormat(formatter, input, expectedResult);-- // correctly handles floats as single tokens- input = @"SELECT 1e-9 AS a, 1.5e-10 AS b, 3.5E12 AS c, 3.5e12 AS d;";- expectedResult =-@"SELECT- 1e-9 AS a,- 1.5e-10 AS b,- 3.5E12 AS c,- 3.5e12 AS d;";- AssertFormat(formatter, input, expectedResult);-- // does not split UNION ALL in half- input =-@"SELECT * FROM tbl1-UNION ALL-SELECT * FROM tbl2;";- expectedResult =-@"SELECT- *-FROM- tbl1-UNION ALL-SELECT- *-FROM- tbl2;";- AssertFormat(formatter, input, expectedResult);-- // correctly formats hardcoded values in from statement- input =-@"SELECT Id FROM (values(1),(2),(3), (4)) as b (id)";- expectedResult =-@"SELECT- Id-FROM- (- values- (1),- (2),- (3),- (4)- ) as b (id)";- AssertFormat(formatter, input, expectedResult);- }-- /// <summary>- /// Shared tests for MySQL and MariaDB- /// </summary>- internal static void BehavesLikeMariaDbFormatter(Formatter formatter)- {- BehavesLikeSqlFormatter(formatter);- SupportsCase(formatter);- SupportsCreateTable(formatter);- SupportsAlterTable(formatter);- SupportsStrings(formatter, "\"\"", "''", "``");- SupportsBetween(formatter);- SupportsComments(formatter);- SupportsConfigOptions(formatter);- SupportsOperators(- formatter,- "%",- "&",- "|",- "^",- "~",- "!=",- "!",- "<=>",- "<<",- ">>",- "&&",- "||",- ":=");- SupportsJoin(- formatter,- without: new[] { "FULL" },- additionally: new[]- {- "STRAIGHT_JOIN",- "NATURAL LEFT JOIN",- "NATURAL LEFT OUTER JOIN",- "NATURAL RIGHT JOIN",- "NATURAL RIGHT OUTER JOIN"- });-- // supports # comments- string input = "SELECT a # comment\r\nFROM b # comment";- string expectedResult =-@"SELECT- a # comment-FROM- b # comment";- AssertFormat(formatter, input, expectedResult);-- // supports @variables- input = "SELECT @foo, @bar";- expectedResult =-@"SELECT- @foo,- @bar";- AssertFormat(formatter, input, expectedResult);-- // supports setting variables: @var :=- input = "SET @foo := (SELECT * FROM tbl);";- expectedResult =-@"SET- @foo := (- SELECT- *- FROM- tbl- );";- AssertFormat(formatter, input, expectedResult);- }-- /// <summary>- /// Tests for standard -- and /* *\/ comments- /// </summary>- internal static void SupportsComments(Formatter formatter)- {- // formats SELECT query with different comments- string input = @"-SELECT-/*- * This is a block comment- */-* FROM--- This is another comment-MyTable -- One final comment-WHERE 1 = 2;";-- string expectedResult =-@"SELECT- /*- * This is a block comment- */- *-FROM- -- This is another comment- MyTable -- One final comment-WHERE- 1 = 2;";- AssertFormat(formatter, input, expectedResult);-- // maintains block comment indentation- input =-@"SELECT- /*- * This is a block comment- */- *-FROM- MyTable-WHERE- 1 = 2";-- expectedResult = input;- AssertFormat(formatter, input, expectedResult);-- // formats tricky line comments- input = "SELECT a--comment, here\r\nFROM b--comment";-- expectedResult =-@"SELECT- a --comment, here-FROM- b --comment";- AssertFormat(formatter, input, expectedResult);-- // formats line comments followed by semicolon- input = @"-SELECT a FROM b---comment-;";-- expectedResult =-@"SELECT- a-FROM- b --comment-;";- AssertFormat(formatter, input, expectedResult);-- // formats line comments followed by comma- input = @"-SELECT a --comment-, b";-- expectedResult =-@"SELECT- a --comment-,- b";- AssertFormat(formatter, input, expectedResult);-- // formats line comments followed by close-paren- input = "SELECT ( a --comment\r\n )";-- expectedResult =-@"SELECT- (a --comment-)";- AssertFormat(formatter, input, expectedResult);-- // formats line comments followed by open-paren- input = "SELECT a --comment\r\n()";-- expectedResult =-@"SELECT- a --comment- ()";- AssertFormat(formatter, input, expectedResult);-- // recognizes line-comments with Windows line-endings (converts them to UNIX)- input = "SELECT * FROM\r\n-- line comment 1\r\nMyTable -- line comment 2\r\n";- expectedResult = "SELECT\r\n *\r\nFROM\r\n -- line comment 1\r\n MyTable -- line comment 2";- AssertFormat(formatter, input, expectedResult);-- // formats query that ends with open comment- input = @"-SELECT count(*)-/*Comment";-- expectedResult =-@"SELECT- count(*)- /*Comment";- AssertFormat(formatter, input, expectedResult);- }-- /// <summary>- /// Tests for all the config options- /// </summary>- internal static void SupportsConfigOptions(Formatter formatter)- {- // supports indent option- string input = @"SELECT count(*),Column1 FROM Table1;";-- string expectedResult =-@"SELECT- count(*),- Column1-FROM- Table1;";-- string output = formatter.Format(input, new SqlFormatterOptions(Indentation: Indentation.FourSpaces, Uppercase: false));- output.Should().Be(expectedResult);-- // supports linesBetweenQueries option- input = @"SELECT * FROM foo; SELECT * FROM bar;";-- expectedResult =-@"SELECT- *-FROM- foo;--SELECT- *-FROM- bar;";-- output = formatter.Format(input, new SqlFormatterOptions(Indentation: Indentation.TwoSpaces, Uppercase: false, LinesBetweenQueries: 2));- output.Should().Be(expectedResult);-- // supports uppercase option- input = @"select distinct * frOM foo left join bar WHERe cola > 1 and colb = 3";-- expectedResult =-@"SELECT- DISTINCT *-FROM- foo- LEFT JOIN bar-WHERE- cola > 1- AND colb = 3";-- output = formatter.Format(input, new SqlFormatterOptions(Indentation: Indentation.TwoSpaces, Uppercase: true));- output.Should().Be(expectedResult);-- // supports indent option one tab- input = @"SELECT count(*),Column1 FROM Table1;";-- expectedResult =-string.Format(@"SELECT-{0}count(*),-{1}Column1-FROM-{2}Table1;", "\t", "\t", "\t");-- output = formatter.Format(input, new SqlFormatterOptions(Indentation: Indentation.OneTab, Uppercase: false));- output.Should().Be(expectedResult);-- // supports leading comma option- input = """-select f.title,-f.replacement_cost,-f.rental_rate,-r.return_date AS total_rentals FROM film f-GROUP by-f.title,-f.replacement_cost,-f.rental_rate-""";-- expectedResult =-"""-SELECT- f.title,- f.replacement_cost,- f.rental_rate,- r.return_date AS total_rentals-FROM- film f-GROUP BY- f.title,- f.replacement_cost,- f.rental_rate-""";-- output = formatter.Format(input, new SqlFormatterOptions(Indentation: Indentation.FourSpaces, Uppercase: true, UseLeadingComma: false));- output.Should().Be(expectedResult);-- expectedResult =-"""-SELECT- f.title- , f.replacement_cost- , f.rental_rate- , r.return_date AS total_rentals-FROM- film f-GROUP BY- f.title- , f.replacement_cost- , f.rental_rate-""";-- output = formatter.Format(input, new SqlFormatterOptions(Indentation: Indentation.FourSpaces, Uppercase: true, UseLeadingComma: true));- output.Should().Be(expectedResult);- }-- /// <summary>- /// Tests support for various operators- /// </summary>- internal static void SupportsOperators(Formatter formatter, params string[] operators)- {- foreach (string op in operators)- {- string input = $"foo{op}bar";- string expectedResult = $"foo {op} bar";- AssertFormat(formatter, input, expectedResult);- }- }-- /// <summary>- /// Tests support for CASE [WHEN...] END syntax- /// </summary>- internal static void SupportsCase(Formatter formatter)- {- // formats CASE ... WHEN with a blank expression- string input = "CASE WHEN option = 'foo' THEN 1 WHEN option = 'bar' THEN 2 WHEN option = 'baz' THEN 3 ELSE 4 END;";-- string expectedResult =-@"CASE- WHEN option = 'foo' THEN 1- WHEN option = 'bar' THEN 2- WHEN option = 'baz' THEN 3- ELSE 4-END;";- AssertFormat(formatter, input, expectedResult);-- // formats CASE ... WHEN with an expression- input = "CASE toString(getNumber()) WHEN 'one' THEN 1 WHEN 'two' THEN 2 WHEN 'three' THEN 3 ELSE 4 END;";-- expectedResult =-@"CASE- toString(getNumber())- WHEN 'one' THEN 1- WHEN 'two' THEN 2- WHEN 'three' THEN 3- ELSE 4-END;";- AssertFormat(formatter, input, expectedResult);-- // formats CASE ... WHEN inside SELECT- input = "SELECT foo, bar, CASE baz WHEN 'one' THEN 1 WHEN 'two' THEN 2 ELSE 3 END FROM table";-- expectedResult =-@"SELECT- foo,- bar,- CASE- baz- WHEN 'one' THEN 1- WHEN 'two' THEN 2- ELSE 3- END-FROM- table";- AssertFormat(formatter, input, expectedResult);-- // recognizes lowercase CASE ... END- input = "case when option = 'foo' then 1 else 2 end;";-- expectedResult =-@"case- when option = 'foo' then 1- else 2-end;";- AssertFormat(formatter, input, expectedResult);-- // ignores words CASE and END inside other strings- input = "SELECT CASEDATE, ENDDATE FROM table1;";-- expectedResult =-@"SELECT- CASEDATE,- ENDDATE-FROM- table1;";- AssertFormat(formatter, input, expectedResult);-- // properly converts to uppercase in case statements- input = "case toString(getNumber()) when 'one' then 1 when 'two' then 2 when 'three' then 3 else 4 end;";-- expectedResult =-@"CASE- toString(getNumber())- WHEN 'one' THEN 1- WHEN 'two' THEN 2- WHEN 'three' THEN 3- ELSE 4-END;";- string output = formatter.Format(input, new SqlFormatterOptions(Indentation: Indentation.TwoSpaces, Uppercase: true));- output.Should().Be(expectedResult);- }-- /// <summary>- /// Tests support for CREATE TABLE syntax- /// </summary>- internal static void SupportsCreateTable(Formatter formatter)- {- // formats short CREATE TABLE- string input = "CREATE TABLE items (a INT PRIMARY KEY, b TEXT);";-- string expectedResult =-@"CREATE TABLE items (a INT PRIMARY KEY, b TEXT);";- AssertFormat(formatter, input, expectedResult);-- // formats long CREATE TABLE- input = "CREATE TABLE items (a INT PRIMARY KEY, b TEXT, c INT NOT NULL, doggie INT NOT NULL);";-- expectedResult =-@"CREATE TABLE items (- a INT PRIMARY KEY,- b TEXT,- c INT NOT NULL,- doggie INT NOT NULL-);";- AssertFormat(formatter, input, expectedResult);- }-- /// <summary>- /// Tests support for ALTER TABLE syntax- /// </summary>- internal static void SupportsAlterTable(Formatter formatter)- {- // formats ALTER TABLE ... ALTER COLUMN query- string input = "ALTER TABLE supplier ALTER COLUMN supplier_name VARCHAR(100) NOT NULL;";-- string expectedResult =-@"ALTER TABLE- supplier-ALTER COLUMN- supplier_name VARCHAR(100) NOT NULL;";- AssertFormat(formatter, input, expectedResult);- }-- /// <summary>- /// Tests support for ALTER TABLE ... MODIFY syntax- /// </summary>- internal static void SupportsAlterTableModify(Formatter formatter)- {- // formats ALTER TABLE ... MODIFY statement- string input = "ALTER TABLE supplier MODIFY supplier_name char(100) NOT NULL;";-- string expectedResult =-@"ALTER TABLE- supplier-MODIFY- supplier_name char(100) NOT NULL;";- AssertFormat(formatter, input, expectedResult);- }-- /// <summary>- /// Tests support for various string syntax- /// </summary>- internal static void SupportsStrings(Formatter formatter, params string[] stringTypes)- {- string input;- string expectedResult;- if (stringTypes.Contains("\"\""))- {- // supports double-quoted strings- input = "\"foo JOIN bar\"";- expectedResult = input;- AssertFormat(formatter, input, expectedResult);-- input = "\"foo \\\" JOIN bar\"";- expectedResult = input;- AssertFormat(formatter, input, expectedResult);- }-- if (stringTypes.Contains("''"))- {- // supports single-quoted strings- input = "'foo JOIN bar'";- expectedResult = input;- AssertFormat(formatter, input, expectedResult);-- input = "'foo \\' JOIN bar'";- expectedResult = input;- AssertFormat(formatter, input, expectedResult);- }-- if (stringTypes.Contains("``"))- {- // supports backtick-quoted strings- input = "`foo JOIN bar`";- expectedResult = input;- AssertFormat(formatter, input, expectedResult);-- input = "`foo `` JOIN bar`";- expectedResult = input;- AssertFormat(formatter, input, expectedResult);- }-- if (stringTypes.Contains("U&\"\""))- {- // supports unicode double-quoted strings- input = "U&\"foo JOIN bar\"";- expectedResult = input;- AssertFormat(formatter, input, expectedResult);-- input = "U&\"foo \\\" JOIN bar\"";- expectedResult = input;- AssertFormat(formatter, input, expectedResult);- }-- if (stringTypes.Contains("U&''"))- {- // supports single-quoted strings- input = "U&'foo JOIN bar'";- expectedResult = input;- AssertFormat(formatter, input, expectedResult);-- input = "U&'foo \\' JOIN bar'";- expectedResult = input;- AssertFormat(formatter, input, expectedResult);- }-- if (stringTypes.Contains("$$"))- {- // supports dollar-quoted strings- input = "$xxx$foo $$ LEFT JOIN $yyy$ bar$xxx$";- expectedResult = input;- AssertFormat(formatter, input, expectedResult);-- input = "$$foo JOIN bar$$";- expectedResult = input;- AssertFormat(formatter, input, expectedResult);-- input = "$$foo $ JOIN bar$$";- expectedResult = input;- AssertFormat(formatter, input, expectedResult);-- input = "$$foo \r\n bar$$";- expectedResult = input;- AssertFormat(formatter, input, expectedResult);- }-- if (stringTypes.Contains("[]"))- {- // supports [bracket-quoted identifiers]- input = "[foo JOIN bar]";- expectedResult = input;- AssertFormat(formatter, input, expectedResult);-- input = "[foo ]] JOIN bar]";- expectedResult = input;- AssertFormat(formatter, input, expectedResult);- }-- if (stringTypes.Contains("N''"))- {- // supports T-SQL unicode strings- input = "N'foo JOIN bar'";- expectedResult = input;- AssertFormat(formatter, input, expectedResult);-- input = "N'foo \\' JOIN bar'";- expectedResult = input;- AssertFormat(formatter, input, expectedResult);- }- }-- /// <summary>- /// Tests support for BETWEEN _ AND _ syntax- /// </summary>- internal static void SupportsBetween(Formatter formatter)- {- // formats BETWEEN _ AND _ on single line- string input = "foo BETWEEN bar AND baz";- string expectedResult = input;- AssertFormat(formatter, input, expectedResult);- }-- /// <summary>- /// Tests support for SET SCHEMA syntax- /// </summary>- internal static void SupportsSchema(Formatter formatter)- {- // formats simple SET SCHEMA statements- string input = "SET SCHEMA schema1;";- string expectedResult =-@"SET SCHEMA- schema1;";- AssertFormat(formatter, input, expectedResult);- }-- /// <summary>- /// Tests support for various joins- /// </summary>- internal static void SupportsJoin(Formatter formatter, string[] without = null, string[] additionally = null)- {- Regex unsupportedJoinRegex- = without != null- ? new Regex(string.Join("|", without), RegexOptions.Compiled)- : new Regex(@"^whateve_!%&$");-- bool isSupportedJoin(string join) => !unsupportedJoinRegex.Match(join).Success;-- string[] joins = new[] { "CROSS JOIN", "NATURAL JOIN" };- foreach (string join in joins)- {- if (isSupportedJoin(join))- {- string input = $"SELECT * FROM tbl1 {join} tbl2";- string expectedResult =-$@"SELECT- *-FROM- tbl1- {join} tbl2";- AssertFormat(formatter, input, expectedResult);- }- }-- // <join> ::= [ <join type> ] JOIN- //- // <join type> ::= INNER | <outer join type> [ OUTER ]- //- // <outer join type> ::= LEFT | RIGHT | FULL-- joins = new[]- {- "JOIN",- "INNER JOIN",- "LEFT JOIN",- "LEFT OUTER JOIN",- "RIGHT JOIN",- "RIGHT OUTER JOIN",- "FULL JOIN",- "FULL OUTER JOIN"- };-- if (additionally != null)- joins = joins.Concat(additionally).ToArray();-- foreach (string join in joins)- {- if (isSupportedJoin(join))- {- string input =-$@"SELECT customer_id.from, COUNT(order_id) AS total FROM customers-{join} orders ON customers.customer_id = orders.customer_id;";- string expectedResult =-$@"SELECT- customer_id.from,- COUNT(order_id) AS total-FROM- customers- {join} orders ON customers.customer_id = orders.customer_id;";- AssertFormat(formatter, input, expectedResult);- }- }- }-- internal static void AssertFormat(Formatter formatter, string input, string expectedOutput)- {- string output = formatter.Format(input);- output.Replace("\r\n", Environment.NewLine).Should().Be(expectedOutput.Replace("\r\n", Environment.NewLine));- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Formatters/Sql/SqlFormatterTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Formatters/Sql/SqlFormatterTests.csdeleted file mode 100644index 7c68026cf..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Formatters/Sql/SqlFormatterTests.cs+++ /dev/null@@ -1,676 +0,0 @@-using DevToys.Tools.Helpers.SqlFormatter.Languages;--namespace DevToys.UnitTests.Tools.Formatters.Sql;--[Collection(nameof(TestParallelizationDisabled))]-public class SqlFormatterTests : MefBasedTest-{- [Fact]- public void StandardSqlFormatterTest()- {- var formatter = new StandardSqlFormatter();- SqlFormatterTestHelpers.BehavesLikeSqlFormatter(formatter);- SqlFormatterTestHelpers.SupportsCase(formatter);- SqlFormatterTestHelpers.SupportsCreateTable(formatter);- SqlFormatterTestHelpers.SupportsAlterTable(formatter);- SqlFormatterTestHelpers.SupportsStrings(formatter, "\"\"", "''");- SqlFormatterTestHelpers.SupportsBetween(formatter);- SqlFormatterTestHelpers.SupportsSchema(formatter);- SqlFormatterTestHelpers.SupportsJoin(formatter);-- // formats FETCH FIRST like LIMIT- string input = "SELECT * FETCH FIRST 2 ROWS ONLY;";- string expectedResult =-@"SELECT- *-FETCH FIRST- 2 ROWS ONLY;";- SqlFormatterTestHelpers.AssertFormat(formatter, input, expectedResult);- }-- [Fact]- public void TSqlFormatterTest()- {- var formatter = new TSqlFormatter();- SqlFormatterTestHelpers.BehavesLikeSqlFormatter(formatter);- SqlFormatterTestHelpers.SupportsCase(formatter);- SqlFormatterTestHelpers.SupportsCreateTable(formatter);- SqlFormatterTestHelpers.SupportsAlterTable(formatter);- SqlFormatterTestHelpers.SupportsStrings(formatter, "\"\"", "''", "N''", "[]");- SqlFormatterTestHelpers.SupportsBetween(formatter);- SqlFormatterTestHelpers.SupportsSchema(formatter);- SqlFormatterTestHelpers.SupportsOperators(formatter, "%", "&", "|", "^", "~", "!=", "!<", "!>", "+=", "-=", "*=", "/=", "%=", "|=", "&=", "^=", "::");- SqlFormatterTestHelpers.SupportsJoin(formatter, without: new[] { "NATURAL" });-- // formats INSERT without INTO- string input = "INSERT Customers (ID, MoneyBalance, Address, City) VALUES (12,-123.4, 'Skagen 2111','Stv');";- string expectedResult =-@"INSERT- Customers (ID, MoneyBalance, Address, City)-VALUES- (12, -123.4, 'Skagen 2111', 'Stv');";- SqlFormatterTestHelpers.AssertFormat(formatter, input, expectedResult);-- // recognizes @variables- input = "SELECT @variable;";- expectedResult = "SELECT\r\n @variable;";- SqlFormatterTestHelpers.AssertFormat(formatter, input, expectedResult);-- // formats SELECT query with CROSS JOIN- input = "SELECT a, b FROM t CROSS JOIN t2 on t.id = t2.id_t";- expectedResult =-@"SELECT- a,- b-FROM- t- CROSS JOIN t2 on t.id = t2.id_t";- SqlFormatterTestHelpers.AssertFormat(formatter, input, expectedResult);- }-- [Fact]- public void SparkSqlFormatterTest()- {- var formatter = new SparkSqlFormatter();- SqlFormatterTestHelpers.BehavesLikeSqlFormatter(formatter);- SqlFormatterTestHelpers.SupportsCase(formatter);- SqlFormatterTestHelpers.SupportsCreateTable(formatter);- SqlFormatterTestHelpers.SupportsAlterTable(formatter);- SqlFormatterTestHelpers.SupportsStrings(formatter, "\"\"", "''", "``");- SqlFormatterTestHelpers.SupportsBetween(formatter);- SqlFormatterTestHelpers.SupportsSchema(formatter);- SqlFormatterTestHelpers.SupportsOperators(formatter, "!=", "%", "|", "&", "^", "~", "!", "<=>", "%", "&&", "||", "==");- SqlFormatterTestHelpers.SupportsJoin(- formatter,- additionally: new[]- {- "ANTI JOIN",- "SEMI JOIN",- "LEFT ANTI JOIN",- "LEFT SEMI JOIN",- "RIGHT OUTER JOIN",- "RIGHT SEMI JOIN",- "NATURAL ANTI JOIN",- "NATURAL FULL OUTER JOIN",- "NATURAL INNER JOIN",- "NATURAL LEFT ANTI JOIN",- "NATURAL LEFT OUTER JOIN",- "NATURAL LEFT SEMI JOIN",- "NATURAL OUTER JOIN",- "NATURAL RIGHT OUTER JOIN",- "NATURAL RIGHT SEMI JOIN",- "NATURAL SEMI JOIN"- });-- // formats WINDOW specification as top level- string input = "SELECT *, LAG(value) OVER wnd AS next_value FROM tbl WINDOW wnd as (PARTITION BY id ORDER BY time);";- string expectedResult =-@"SELECT- *,- LAG(value) OVER wnd AS next_value-FROM- tbl-WINDOW- wnd as (- PARTITION BY- id- ORDER BY- time- );";- SqlFormatterTestHelpers.AssertFormat(formatter, input, expectedResult);-- // formats window function and end as inline- input = "SELECT window(time, \"1 hour\").start AS window_start, window(time, \"1 hour\").end AS window_end FROM tbl;";- expectedResult = "SELECT\r\n window(time, \"1 hour\").start AS window_start,\r\n window(time, \"1 hour\").end AS window_end\r\nFROM\r\n tbl;";- SqlFormatterTestHelpers.AssertFormat(formatter, input, expectedResult);- }-- [Fact]- public void RedshiftFormatterTest()- {- var formatter = new RedshiftFormatter();- SqlFormatterTestHelpers.BehavesLikeSqlFormatter(formatter);- SqlFormatterTestHelpers.SupportsCreateTable(formatter);- SqlFormatterTestHelpers.SupportsAlterTable(formatter);- SqlFormatterTestHelpers.SupportsAlterTableModify(formatter);- SqlFormatterTestHelpers.SupportsStrings(formatter, "\"\"", "''", "``");- SqlFormatterTestHelpers.SupportsSchema(formatter);- SqlFormatterTestHelpers.SupportsOperators(formatter, "%", "^", "|/", "||/", "<<", ">>", "&", "|", "~", "!", "!=", "||");- SqlFormatterTestHelpers.SupportsJoin(formatter);-- // formats LIMIT- string input = "SELECT col1 FROM tbl ORDER BY col2 DESC LIMIT 10;";- string expectedResult =-@"SELECT- col1-FROM- tbl-ORDER BY- col2 DESC-LIMIT- 10;";- SqlFormatterTestHelpers.AssertFormat(formatter, input, expectedResult);-- // formats only -- as a line comment- input =-@"SELECT col FROM--- This is a comment-MyTable;";- expectedResult =-@"SELECT- col-FROM- -- This is a comment- MyTable;";- SqlFormatterTestHelpers.AssertFormat(formatter, input, expectedResult);-- // recognizes @ as part of identifiers- input = @"SELECT @col1 FROM tbl";- expectedResult =-@"SELECT- @col1-FROM- tbl";- SqlFormatterTestHelpers.AssertFormat(formatter, input, expectedResult);-- // formats DISTKEY and SORTKEY after CREATE TABLE- input = @"CREATE TABLE items (a INT PRIMARY KEY, b TEXT, c INT NOT NULL, d INT NOT NULL) DISTKEY(created_at) SORTKEY(created_at);";- expectedResult =-@"CREATE TABLE items (a INT PRIMARY KEY, b TEXT, c INT NOT NULL, d INT NOT NULL)-DISTKEY-(created_at)-SORTKEY-(created_at);";- SqlFormatterTestHelpers.AssertFormat(formatter, input, expectedResult);-- // formats COPY- input =-@"COPY schema.table-FROM 's3://bucket/file.csv'-IAM_ROLE 'arn:aws:iam::123456789:role/rolename'-FORMAT AS CSV DELIMITER ',' QUOTE ''-REGION AS 'us-east-1'";- expectedResult =-@"COPY- schema.table-FROM- 's3://bucket/file.csv'-IAM_ROLE- 'arn:aws:iam::123456789:role/rolename'-FORMAT- AS CSV-DELIMITER- ',' QUOTE ''-REGION- AS 'us-east-1'";- SqlFormatterTestHelpers.AssertFormat(formatter, input, expectedResult);- }-- [Fact]- public void PostgreSqlFormatterTest()- {- var formatter = new PostgreSqlFormatter();- SqlFormatterTestHelpers.BehavesLikeSqlFormatter(formatter);- SqlFormatterTestHelpers.SupportsCase(formatter);- SqlFormatterTestHelpers.SupportsCreateTable(formatter);- SqlFormatterTestHelpers.SupportsAlterTable(formatter);- SqlFormatterTestHelpers.SupportsStrings(formatter, "\"\"", "''", "U&\"\"", "U&''", "$$");- SqlFormatterTestHelpers.SupportsBetween(formatter);- SqlFormatterTestHelpers.SupportsSchema(formatter);- SqlFormatterTestHelpers.SupportsOperators(- formatter,- "%",- "^",- "!",- "!!",- "!=",- "&",- "|",- "~",- "#",- "<<",- ">>",- "||/",- "|/",- "::",- "->>",- "->",- "~~*",- "~~",- "!~~*",- "!~~",- "~*",- "!~*",- "!~");- SqlFormatterTestHelpers.SupportsJoin(formatter);-- // supports $n placeholders- string input = "SELECT $1, $2 FROM tbl";- string expectedResult =-@"SELECT- $1,- $2-FROM- tbl";- SqlFormatterTestHelpers.AssertFormat(formatter, input, expectedResult);-- // supports :name placeholders- input = "foo = :bar";- expectedResult = input;- SqlFormatterTestHelpers.AssertFormat(formatter, input, expectedResult);- }-- [Fact]- public void PlSqlFormatterTest()- {- var formatter = new PlSqlFormatter();- SqlFormatterTestHelpers.BehavesLikeSqlFormatter(formatter);- SqlFormatterTestHelpers.SupportsCase(formatter);- SqlFormatterTestHelpers.SupportsCreateTable(formatter);- SqlFormatterTestHelpers.SupportsAlterTable(formatter);- SqlFormatterTestHelpers.SupportsAlterTableModify(formatter);- SqlFormatterTestHelpers.SupportsStrings(formatter, "\"\"", "''", "``");- SqlFormatterTestHelpers.SupportsBetween(formatter);- SqlFormatterTestHelpers.SupportsSchema(formatter);- SqlFormatterTestHelpers.SupportsOperators(formatter, "||", "**", "!=", ":=");- SqlFormatterTestHelpers.SupportsJoin(formatter);-- // formats FETCH FIRST like LIMIT- string input = "SELECT col1 FROM tbl ORDER BY col2 DESC FETCH FIRST 20 ROWS ONLY;";- string expectedResult =-@"SELECT- col1-FROM- tbl-ORDER BY- col2 DESC-FETCH FIRST- 20 ROWS ONLY;";- SqlFormatterTestHelpers.AssertFormat(formatter, input, expectedResult);-- // formats only -- as a line comment- input = "SELECT col FROM\r\n-- This is a comment\r\nMyTable;\r\n";- expectedResult =-@"SELECT- col-FROM- -- This is a comment- MyTable;";- SqlFormatterTestHelpers.AssertFormat(formatter, input, expectedResult);-- // recognizes _, $, #, . and @ as part of identifiers- input = "SELECT my_col$1#, col.2@ FROM tbl\r\n";- expectedResult =-@"SELECT- my_col$1#,- col.2@-FROM- tbl";- SqlFormatterTestHelpers.AssertFormat(formatter, input, expectedResult);-- // formats INSERT without INTO- input = "INSERT Customers (ID, MoneyBalance, Address, City) VALUES (12,-123.4, 'Skagen 2111','Stv');";- expectedResult =-@"INSERT- Customers (ID, MoneyBalance, Address, City)-VALUES- (12, -123.4, 'Skagen 2111', 'Stv');";- SqlFormatterTestHelpers.AssertFormat(formatter, input, expectedResult);-- // recognizes ?[0-9]* placeholders- input = "SELECT ?1, ?25, ?;";- expectedResult =-@"SELECT- ?1,- ?25,- ?;";- SqlFormatterTestHelpers.AssertFormat(formatter, input, expectedResult);-- // formats SELECT query with CROSS APPLY- input = "SELECT a, b FROM t CROSS APPLY fn(t.id)";- expectedResult =-@"SELECT- a,- b-FROM- t- CROSS APPLY fn(t.id)";- SqlFormatterTestHelpers.AssertFormat(formatter, input, expectedResult);-- // formats simple SELECT- input = "SELECT N, M FROM t";- expectedResult =-@"SELECT- N,- M-FROM- t";- SqlFormatterTestHelpers.AssertFormat(formatter, input, expectedResult);-- // formats simple SELECT with national characters- input = "SELECT N'value'";- expectedResult =-@"SELECT- N'value'";- SqlFormatterTestHelpers.AssertFormat(formatter, input, expectedResult);-- // formats SELECT query with OUTER APPLY- input = "SELECT a, b FROM t OUTER APPLY fn(t.id)";- expectedResult =-@"SELECT- a,- b-FROM- t- OUTER APPLY fn(t.id)";- SqlFormatterTestHelpers.AssertFormat(formatter, input, expectedResult);-- // formats Oracle recursive sub queries- input =-@"WITH t1(id, parent_id) AS (- -- Anchor member.- SELECT- id,- parent_id- FROM- tab1- WHERE- parent_id IS NULL- MINUS- -- Recursive member.- SELECT- t2.id,- t2.parent_id- FROM- tab1 t2,- t1- WHERE- t2.parent_id = t1.id-) SEARCH BREADTH FIRST BY id SET order1,-another AS (SELECT * FROM dual)-SELECT id, parent_id FROM t1 ORDER BY order1;";- expectedResult =-@"WITH t1(id, parent_id) AS (- -- Anchor member.- SELECT- id,- parent_id- FROM- tab1- WHERE- parent_id IS NULL- MINUS- -- Recursive member.- SELECT- t2.id,- t2.parent_id- FROM- tab1 t2,- t1- WHERE- t2.parent_id = t1.id-) SEARCH BREADTH FIRST BY id SET order1,-another AS (- SELECT- *- FROM- dual-)-SELECT- id,- parent_id-FROM- t1-ORDER BY- order1;";- SqlFormatterTestHelpers.AssertFormat(formatter, input, expectedResult);-- // formats Oracle recursive sub queries regardless of capitalization- input =-@"WITH t1(id, parent_id) AS (- -- Anchor member.- SELECT- id,- parent_id- FROM- tab1- WHERE- parent_id IS NULL- MINUS- -- Recursive member.- SELECT- t2.id,- t2.parent_id- FROM- tab1 t2,- t1- WHERE- t2.parent_id = t1.id-) SEARCH BREADTH FIRST by id set order1,-another AS (SELECT * FROM dual)-SELECT id, parent_id FROM t1 ORDER BY order1;";- expectedResult =-@"WITH t1(id, parent_id) AS (- -- Anchor member.- SELECT- id,- parent_id- FROM- tab1- WHERE- parent_id IS NULL- MINUS- -- Recursive member.- SELECT- t2.id,- t2.parent_id- FROM- tab1 t2,- t1- WHERE- t2.parent_id = t1.id-) SEARCH BREADTH FIRST by id set order1,-another AS (- SELECT- *- FROM- dual-)-SELECT- id,- parent_id-FROM- t1-ORDER BY- order1;";- SqlFormatterTestHelpers.AssertFormat(formatter, input, expectedResult);- }-- [Fact]- public void N1qlFormatterTest()- {- var formatter = new N1qlFormatter();- SqlFormatterTestHelpers.BehavesLikeSqlFormatter(formatter);- SqlFormatterTestHelpers.SupportsStrings(formatter, "\"\"", "''", "``");- SqlFormatterTestHelpers.SupportsBetween(formatter);- SqlFormatterTestHelpers.SupportsSchema(formatter);- SqlFormatterTestHelpers.SupportsOperators(formatter, "%", "==", "!=");- SqlFormatterTestHelpers.SupportsJoin(formatter, without: new[] { "FULL", "CROSS", "NATURAL" });-- // formats SELECT query with element selection expression- string input = "SELECT order_lines[0].productId FROM orders;";- string expectedResult =-@"SELECT- order_lines[0].productId-FROM- orders;";- SqlFormatterTestHelpers.AssertFormat(formatter, input, expectedResult);-- // formats SELECT query with primary key querying- input = "SELECT fname, email FROM tutorial USE KEYS ['dave', 'ian'];";- expectedResult =-@"SELECT- fname,-FROM- tutorial-USE KEYS- ['dave', 'ian'];";- SqlFormatterTestHelpers.AssertFormat(formatter, input, expectedResult);-- // formats INSERT with {} object literal- input = "INSERT INTO heroes (KEY, VALUE) VALUES ('123', {'id':1,'type':'Tarzan'});";- expectedResult =-@"INSERT INTO- heroes (KEY, VALUE)-VALUES- ('123', {'id': 1, 'type': 'Tarzan'});";- SqlFormatterTestHelpers.AssertFormat(formatter, input, expectedResult);-- // formats INSERT with large object and array literals- input = "INSERT INTO heroes (KEY, VALUE) VALUES ('123', {'id': 1, 'type': 'Tarzan', 'array': [123456789, 123456789, 123456789, 123456789, 123456789], 'hello': 'world'});";- expectedResult =-@"INSERT INTO- heroes (KEY, VALUE)-VALUES- (- '123',- {- 'id': 1,- 'type': 'Tarzan',- 'array': [- 123456789,- 123456789,- 123456789,- 123456789,- 123456789- ],- 'hello': 'world'- }- );";- SqlFormatterTestHelpers.AssertFormat(formatter, input, expectedResult);-- // formats SELECT query with UNNEST top level reserver word- input = "SELECT * FROM tutorial UNNEST tutorial.children c;";- expectedResult =-@"SELECT- *-FROM- tutorial-UNNEST- tutorial.children c;";- SqlFormatterTestHelpers.AssertFormat(formatter, input, expectedResult);-- // formats SELECT query with NEST and USE KEYS- input =-@"SELECT * FROM usr-USE KEYS 'Elinor_33313792' NEST orders_with_users orders-ON KEYS ARRAY s.order_id FOR s IN usr.shipped_order_history END;";- expectedResult =-@"SELECT- *-FROM- usr-USE KEYS- 'Elinor_33313792'-NEST- orders_with_users orders ON KEYS ARRAY s.order_id FOR s IN usr.shipped_order_history END;";- SqlFormatterTestHelpers.AssertFormat(formatter, input, expectedResult);-- // formats explained DELETE query with USE KEYS and RETURNING- input = "EXPLAIN DELETE FROM tutorial t USE KEYS 'baldwin' RETURNING t";- expectedResult =-@"EXPLAIN DELETE FROM- tutorial t-USE KEYS- 'baldwin' RETURNING t";- SqlFormatterTestHelpers.AssertFormat(formatter, input, expectedResult);-- // formats UPDATE query with USE KEYS and RETURNING- input = "UPDATE tutorial USE KEYS 'baldwin' SET type = 'actor' RETURNING tutorial.type";- expectedResult =-@"UPDATE- tutorial-USE KEYS- 'baldwin'-SET- type = 'actor' RETURNING tutorial.type";- SqlFormatterTestHelpers.AssertFormat(formatter, input, expectedResult);-- // recognizes $variables- input = "SELECT $variable;";- expectedResult = "SELECT\r\n $variable;";- SqlFormatterTestHelpers.AssertFormat(formatter, input, expectedResult);- }-- [Fact]- public void MySqlFormatterTest()- {- var formatter = new MySqlFormatter();- SqlFormatterTestHelpers.BehavesLikeMariaDbFormatter(formatter);- SqlFormatterTestHelpers.SupportsOperators(formatter, "->", "->>");- }-- [Fact]- public void MariaDbFormatterTest()- {- var formatter = new MariaDbFormatter();- SqlFormatterTestHelpers.BehavesLikeMariaDbFormatter(formatter);- }-- [Fact]- public void Db2FormatterTest()- {- var formatter = new Db2Formatter();- SqlFormatterTestHelpers.BehavesLikeSqlFormatter(formatter);- SqlFormatterTestHelpers.SupportsCreateTable(formatter);- SqlFormatterTestHelpers.SupportsAlterTable(formatter);- SqlFormatterTestHelpers.SupportsStrings(formatter, "\"\"", "''", "``");- SqlFormatterTestHelpers.SupportsBetween(formatter);- SqlFormatterTestHelpers.SupportsSchema(formatter);- SqlFormatterTestHelpers.SupportsOperators(formatter, "%", "**", "!=", "!>", "!>", "||");-- // formats FETCH FIRST like LIMIT- string input = "SELECT col1 FROM tbl ORDER BY col2 DESC FETCH FIRST 20 ROWS ONLY;";- string expectedResult =-@"SELECT- col1-FROM- tbl-ORDER BY- col2 DESC-FETCH FIRST- 20 ROWS ONLY;";- SqlFormatterTestHelpers.AssertFormat(formatter, input, expectedResult);-- // formats only -- as a line comment- input =-@"SELECT col FROM--- This is a comment-MyTable;";- expectedResult =-@"SELECT- col-FROM- -- This is a comment- MyTable;";- SqlFormatterTestHelpers.AssertFormat(formatter, input, expectedResult);-- // recognizes @ and # as part of identifiers- input = "SELECT col#1, @col2 FROM tbl";- expectedResult =-@"SELECT- col#1,- @col2-FROM- tbl";- SqlFormatterTestHelpers.AssertFormat(formatter, input, expectedResult);-- // recognizes :variables- input = "SELECT :variable;";- expectedResult =-@"SELECT- :variable;";- SqlFormatterTestHelpers.AssertFormat(formatter, input, expectedResult);- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Formatters/Xml/XmlFormatterCommandLineToolTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Formatters/Xml/XmlFormatterCommandLineToolTests.csdeleted file mode 100644index 461353060..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Formatters/Xml/XmlFormatterCommandLineToolTests.cs+++ /dev/null@@ -1,219 +0,0 @@-using System.IO;-using System.Threading.Tasks;-using DevToys.CLI;-using DevToys.Tools.Models;-using DevToys.Tools.Tools.Formatters.Xml;-using Microsoft.Extensions.Logging;--namespace DevToys.UnitTests.Tools.Formatters;--[Collection(nameof(TestParallelizationDisabled))]-public sealed class XmlFormatterCommandLineToolTests : MefBasedTest-{- private readonly StringWriter _consoleWriter = new();- private readonly StringWriter _consoleErrorWriter = new();- private readonly XmlFormatterCommandLineTool _tool;- private readonly Mock<ILogger> _loggerMock;- private readonly string _baseTestDataDirectory = Path.Combine("Tools", "TestData", nameof(XmlFormatter));-- public XmlFormatterCommandLineToolTests()- : base(typeof(XmlFormatterCommandLineTool).Assembly)- {- _tool = (XmlFormatterCommandLineTool)MefProvider.ImportMany<ICommandLineTool, CommandLineToolMetadata>()- .Single(t => t.Metadata.InternalComponentName == "XmlFormatter").Value;-- _loggerMock = new Mock<ILogger>();- Console.SetOut(_consoleWriter);- Console.SetError(_consoleErrorWriter);- }-- [Theory(DisplayName = "Format with invalid input should return error exit code")]- [InlineData("")]- [InlineData(" ")]- public async Task FormatXmlInvalidInputShouldReturnErrorExitCode(string input)- {- _tool.Input = input;-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(-1);- string consoleOutput = _consoleErrorWriter.ToString().Trim();- consoleOutput.Should().Be("");- }-- [Fact(DisplayName = "Format xml with invalid xml should output invalid xml error")]- public async Task FormatXmlInvalidXmlShouldOutputInvalidXmlError()- {- _tool.Input = "<root><xml></root > ";-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(-1);- string consoleOutput = _consoleErrorWriter.ToString().Trim();- consoleOutput.Should().Be("The 'xml' start tag on line 1 position 8 does not match the end tag of 'root'. Line 1, position 14.");- }-- [Theory(DisplayName = "Format xml with valid xml and two spaces indentation should output valid xml")]- [InlineData(true, "<root>\r\n <xml\r\n test=\"true\" />\r\n</root>")]- [InlineData(false, "<root>\r\n <xml test=\"true\" />\r\n</root>")]- public async Task FormatXmlWithValidXmlAndTwoSpacesShouldOutputValidXml(bool newLineOnAttributes, string expectedResult)- {- expectedResult = expectedResult.Replace("\r\n", Environment.NewLine);- _tool.NewLineOnAttributes = newLineOnAttributes;- _tool.Input = "<root><xml test=\"true\" /></root>";-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(0);- string consoleOutput = _consoleWriter.ToString().Trim();- consoleOutput.Should().Be(expectedResult);- }-- [Theory(DisplayName = "Format xml with valid xml and four spaces indentation should output valid xml")]- [InlineData(true, "<root>\r\n <xml\r\n test=\"true\" />\r\n</root>")]- [InlineData(false, "<root>\r\n <xml test=\"true\" />\r\n</root>")]- public async Task FormatXmlWithValidXmlAndFourSpacesShouldOutputValidXml(bool newLineOnAttributes, string expectedResult)- {- expectedResult = expectedResult.Replace("\r\n", Environment.NewLine);- _tool.IndentationMode = Indentation.FourSpaces;- _tool.NewLineOnAttributes = newLineOnAttributes;- _tool.Input = "<root><xml test=\"true\" /></root>";-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(0);- string consoleOutput = _consoleWriter.ToString().Trim();- consoleOutput.Should().Be(expectedResult);- }-- [Theory(DisplayName = "Format xml with valid xml and one tab indentation should output valid xml")]- [InlineData(true, "<root>\r\n\t<xml\r\n\t\ttest=\"true\" />\r\n</root>")]- [InlineData(false, "<root>\r\n\t<xml test=\"true\" />\r\n</root>")]- public async Task FormatXmlWithValidXmlAndOneTabShouldOutputValidXml(bool newLineOnAttributes, string expectedResult)- {- expectedResult = expectedResult.Replace("\r\n", Environment.NewLine);- _tool.IndentationMode = Indentation.OneTab;- _tool.NewLineOnAttributes = newLineOnAttributes;- _tool.Input = "<root><xml test=\"true\" /></root>";-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(0);- string consoleOutput = _consoleWriter.ToString().Trim();- consoleOutput.Should().Be(expectedResult);- }-- [Theory(DisplayName = "Format xml with valid xml and minified indentation should output valid xml")]- [InlineData(true, "<root><xml test=\"true\" /></root>")]- [InlineData(false, "<root><xml test=\"true\" /></root>")]- public async Task FormatXmlWithValidXmlAndMinifiedShouldOutputValidXml(bool newLineOnAttributes, string expectedResult)- {- _tool.IndentationMode = Indentation.Minified;- _tool.NewLineOnAttributes = newLineOnAttributes;- _tool.Input = "<root><xml test=\"true\" /></root>";-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(0);- string consoleOutput = _consoleWriter.ToString().Trim();- consoleOutput.Should().Be(expectedResult);- }-- [Fact(DisplayName = "Format xml with unknown xml file should output invalid xml error")]- public async Task FormatXmlWithUnknownFileInputShouldReturnErrorExitCode()- {- string filePath = Path.Combine(_baseTestDataDirectory, "Unknown.xml");- FileInfo inputFile = TestDataProvider.GetFile(filePath);- _tool.Input = inputFile;- _tool.OutputFile = new FileInfo("Dummy.xml");- ((MockIFileStorage)MefProvider.Import<IFileStorage>()).FileExistsResult = false;-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(-1);- string consoleOutput = _consoleErrorWriter.ToString().Trim();- consoleOutput.Should().Be(XmlFormatter.InputFileNotFound);- }-- [Fact(DisplayName = "Format xml with valid xml file and two spaces indentation should output valid xml file")]- public async Task FormatXmlWithValidFileInputAndTwoSpacesShouldOutputValidXmlFile()- {- string expectedFilePath = Path.Combine(_baseTestDataDirectory, "TwoSpaces.xml");- string expectedContent = File.ReadAllText(expectedFilePath);-- string filePath = Path.Combine(_baseTestDataDirectory, "ValidXml.xml");- FileInfo inputFile = TestDataProvider.GetFile(filePath);- _tool.Input = inputFile;- _tool.OutputFile = new FileInfo("OutputTwoSpaces.xml");-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(0);- string outputContent = File.ReadAllText(_tool.OutputFile.FullName);- outputContent.Should().Be(expectedContent);- }-- [Fact(DisplayName = "Format xml with valid xml file and four spaces indentation should output valid xml file")]- public async Task FormatXmlWithValidFileInputAndFourSpacesShouldOutputValidXmlFile()- {- string expectedFilePath = Path.Combine(_baseTestDataDirectory, "FourSpaces.xml");- string expectedContent = File.ReadAllText(expectedFilePath);-- string filePath = Path.Combine(_baseTestDataDirectory, "ValidXml.xml");- FileInfo inputFile = TestDataProvider.GetFile(filePath);- _tool.Input = inputFile;- _tool.IndentationMode = Indentation.FourSpaces;- _tool.OutputFile = new FileInfo("OutputFourSpaces.xml");-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(0);- string outputContent = File.ReadAllText(_tool.OutputFile.FullName);- outputContent.Should().Be(expectedContent);- }-- [Fact(DisplayName = "Format xml with valid xml file and one tab indentation should output valid xml file")]- public async Task FormatXmlWithValidFileInputAndOneTabShouldOutputValidXmlFile()- {- string expectedFilePath = Path.Combine(_baseTestDataDirectory, "OneTab.xml");- string expectedContent = File.ReadAllText(expectedFilePath);-- string filePath = Path.Combine(_baseTestDataDirectory, "ValidXml.xml");- FileInfo inputFile = TestDataProvider.GetFile(filePath);- _tool.Input = inputFile;- _tool.IndentationMode = Indentation.OneTab;- _tool.OutputFile = new FileInfo("OutputOneTab.xml");-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(0);- string outputContent = File.ReadAllText(_tool.OutputFile.FullName);- outputContent.Should().Be(expectedContent);- }-- [Fact(DisplayName = "Format xml with valid xml file and minified indentation should output valid xml file")]- public async Task FormatXmlWithValidFileInputAndMinifiedShouldOutputValidXmlFile()- {- string expectedFilePath = Path.Combine(_baseTestDataDirectory, "Minified.xml");- string expectedContent = File.ReadAllText(expectedFilePath);-- string filePath = Path.Combine(_baseTestDataDirectory, "ValidXml.xml");- FileInfo inputFile = TestDataProvider.GetFile(filePath);- _tool.Input = inputFile;- _tool.IndentationMode = Indentation.Minified;- _tool.OutputFile = new FileInfo("OutputMinified.xml");-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(0);- string outputContent = File.ReadAllText(_tool.OutputFile.FullName);- outputContent.Should().Be(expectedContent);- }-- [Fact(DisplayName = "Format xml with valid xml file and new line on attributes should output valid xml file")]- public async Task FormatXmlWithValidFileInputAndNewLineOnAttributesShouldOutputValidXmlFile()- {- string expectedFilePath = Path.Combine(_baseTestDataDirectory, "NewLineOnAttributes.xml");- string expectedContent = File.ReadAllText(expectedFilePath);-- string filePath = Path.Combine(_baseTestDataDirectory, "ValidXml.xml");- FileInfo inputFile = TestDataProvider.GetFile(filePath);- _tool.Input = inputFile;- _tool.NewLineOnAttributes = true;- _tool.OutputFile = new FileInfo("OutputNewLineOnAttributes.xml");-- int result = await _tool.InvokeAsync(_loggerMock.Object, default);- result.Should().Be(0);- string outputContent = File.ReadAllText(_tool.OutputFile.FullName);- outputContent.Should().Be(expectedContent);- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Formatters/Xml/XmlFormatterGuiToolTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Formatters/Xml/XmlFormatterGuiToolTests.csdeleted file mode 100644index 29512e1f4..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Formatters/Xml/XmlFormatterGuiToolTests.cs+++ /dev/null@@ -1,116 +0,0 @@-using System.Globalization;-using System.Threading.Tasks;-using DevToys.Core.Tools.Metadata;-using DevToys.Tools.Tools.Formatters.Xml;--namespace DevToys.UnitTests.Tools.Formatters;--public class XmlFormatterGuiToolTests : MefBasedTest-{- private readonly UIToolView _toolView;- private readonly XmlFormatterGuiTool _tool;- private readonly IUIMultiLineTextInput _inputTextArea;- private readonly IUIMultiLineTextInput _outputTextArea;-- public XmlFormatterGuiToolTests()- : base(typeof(XmlFormatterGuiTool).Assembly)- {- _tool = (XmlFormatterGuiTool)MefProvider.ImportMany<IGuiTool, GuiToolMetadata>()- .Single(t => t.Metadata.InternalComponentName == "XmlFormatter")- .Value;-- _toolView = _tool.View;-- _inputTextArea = (IUIMultiLineTextInput)_toolView.GetChildElementById("xml-input-text-area");- _outputTextArea = (IUIMultiLineTextInput)_toolView.GetChildElementById("xml-output-text-area");- CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture;- CultureInfo.CurrentCulture = CultureInfo.InvariantCulture;- }-- [Theory(DisplayName = "Format xml with invalid xml should return empty string")]- [InlineData(null)]- [InlineData("")]- [InlineData(" ")]- public async Task FormatXmlWithInvalidXmlShouldReturnXmlError(string input)- {- _inputTextArea.Text("abc");- _inputTextArea.Text(input);- await _tool.WorkTask;- _outputTextArea.Text.Should().Be("");- }-- [Fact(DisplayName = "Format xml with invalid xml should return xml exception message")]- public async Task FormatXmlWithInvalidXmlShouldReturnXmlExceptionMessage()- {- _inputTextArea.Text("<root><xml></root > ");- await _tool.WorkTask;- _outputTextArea.Text.Should().Be("The 'xml' start tag on line 1 position 8 does not match the end tag of 'root'. Line 1, position 14.");- }-- [Fact(DisplayName = "Format xml with valid xml and two spaces indentation should return valid xml")]- public async Task FormatXmlWithValidXmlAndTwoSpacesShouldReturnValidXml()- {- _inputTextArea.Text("<root><xml /></root>");-- var indentationOptions = (IUISelectDropDownList)((IUISetting)_toolView.GetChildElementById("xml-text-indentation-setting")).InteractiveElement;- indentationOptions.Select(0); // Select TwoSpaces-- await _tool.WorkTask;- _outputTextArea.Text.Should().Be("<root>\r\n <xml />\r\n</root>".Replace("\r\n", Environment.NewLine));- }-- [Fact(DisplayName = "Format xml with valid xml and four spaces indentation should return valid xml")]- public async Task FormatXmlWithValidXmlAndFourSpacesShouldReturnValidXml()- {- _inputTextArea.Text("<root><xml /></root>");-- var indentationOptions = (IUISelectDropDownList)((IUISetting)_toolView.GetChildElementById("xml-text-indentation-setting")).InteractiveElement;- indentationOptions.Select(1); // Select FourSpaces-- await _tool.WorkTask;- _outputTextArea.Text.Should().Be("<root>\r\n <xml />\r\n</root>".Replace("\r\n", Environment.NewLine));- }-- [Fact(DisplayName = "Format xml with valid xml and one tab indentation should return valid xml")]- public async Task FormatXmlWithValidXmlAndOneTabShouldReturnValidXml()- {- _inputTextArea.Text("<root><xml /></root>");-- var indentationOptions = (IUISelectDropDownList)((IUISetting)_toolView.GetChildElementById("xml-text-indentation-setting")).InteractiveElement;- indentationOptions.Select(2); // Select OneTab-- await _tool.WorkTask;- _outputTextArea.Text.Should().Be("<root>\r\n\t<xml />\r\n</root>".Replace("\r\n", Environment.NewLine));- }-- [Fact(DisplayName = "Format xml with valid xml and minified should return valid xml")]- public async Task FormatXmlWithValidXmlAndMinifiedShouldReturnValidXml()- {- _inputTextArea.Text("<root>\r\n <xml />\r\n</root>");-- var indentationOptions = (IUISelectDropDownList)((IUISetting)_toolView.GetChildElementById("xml-text-indentation-setting")).InteractiveElement;- indentationOptions.Select(3); // Select Minified-- await _tool.WorkTask;- _outputTextArea.Text.Should().Be("<root><xml /></root>");- }-- [Fact(DisplayName = "Format xml with valid xml and new line on attributes should return valid xml")]- public async Task FormatXmlWithValidXmlAndNewLineOnAttributesShouldReturnValidXml()- {- _inputTextArea.Text("<root><xml test=\"true\" /></root>");- var indentationOptions = (IUISelectDropDownList)((IUISetting)_toolView.GetChildElementById("xml-text-indentation-setting")).InteractiveElement;- indentationOptions.Select(0); // Select TwoSpaces-- var newLineOnAttributesOptions = (IUISwitch)((IUISetting)_toolView.GetChildElementById("xml-text-newLineOnAttributes-setting")).InteractiveElement;- newLineOnAttributesOptions.On();-- await _tool.WorkTask;- _outputTextArea.Text.Should().Be("<root>\r\n <xml\r\n test=\"true\" />\r\n</root>".Replace("\r\n", Environment.NewLine));-- newLineOnAttributesOptions.Off();-- await _tool.WorkTask;- _outputTextArea.Text.Should().Be("<root>\r\n <xml test=\"true\" />\r\n</root>".Replace("\r\n", Environment.NewLine));- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Generators/HashAndChecksumGeneratorCommandLineToolTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Generators/HashAndChecksumGeneratorCommandLineToolTests.csdeleted file mode 100644index a2fe7bb13..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Generators/HashAndChecksumGeneratorCommandLineToolTests.cs+++ /dev/null@@ -1,137 +0,0 @@-using System.IO;-using System.Threading;-using System.Threading.Tasks;-using DevToys.CLI;-using DevToys.Tools.Tools.Generators.HashAndChecksum;--namespace DevToys.UnitTests.Tools.Generators;--[Collection(nameof(TestParallelizationDisabled))]-public sealed class HashAndChecksumGeneratorCommandLineToolTests : MefBasedTest-{- private readonly HashAndChecksumGeneratorCommandLineTool _tool;- private readonly string _baseTestDataDirectory = Path.Combine("Tools", "TestData", nameof(HashAndChecksumGenerator));-- public HashAndChecksumGeneratorCommandLineToolTests()- : base(typeof(HashAndChecksumGeneratorCommandLineTool).Assembly)- {- _tool = (HashAndChecksumGeneratorCommandLineTool)MefProvider.ImportMany<ICommandLineTool, CommandLineToolMetadata>()- .Single(t => t.Metadata.InternalComponentName == "HashAndChecksumGenerator")- .Value;- _tool.Silent = true;- }-- [Fact]- public async Task HashText()- {- _tool.Input = "hello";-- using var consoleOutput = new ConsoleOutputMonitor();- int exitCode = await _tool.InvokeAsync(new MockILogger(), CancellationToken.None);- exitCode.Should().Be(0);-- string result = consoleOutput.GetOutput().Trim();- result.Should().Be("5d41402abc4b2a76b9719d911017c592");- }-- [Fact]- public async Task HashFile()- {- _tool.Input = TestDataProvider.GetFile(Path.Combine(_baseTestDataDirectory, "File.txt"));-- using var consoleOutput = new ConsoleOutputMonitor();- int exitCode = await _tool.InvokeAsync(new MockILogger(), CancellationToken.None);- exitCode.Should().Be(0);-- string result = consoleOutput.GetOutput().Trim();- result.Should().Be("3e25960a79dbc69b674cd4ec67a72c62");- }-- [Fact]- public async Task HashNonExistentFileOutputsError()- {- _tool.Input = TestDataProvider.GetFile(Path.Combine(_baseTestDataDirectory, "DoesNotExist.txt"));- ((MockIFileStorage)MefProvider.Import<IFileStorage>()).FileExistsResult = false;-- using var consoleOutput = new ConsoleOutputMonitor();- int exitCode = await _tool.InvokeAsync(new MockILogger(), CancellationToken.None);- exitCode.Should().Be(-1);-- string result = consoleOutput.GetError().Trim();- result.Should().Be(HashAndChecksumGenerator.InvalidInputOrFileCommand);- }-- [Fact]- public async Task HashNoAlgorithm()- {- _tool.Input = "Hello";- _tool.HashAlgorithm = System.Security.Authentication.HashAlgorithmType.None;-- using var consoleOutput = new ConsoleOutputMonitor();- int exitCode = await _tool.InvokeAsync(new MockILogger(), CancellationToken.None);- exitCode.Should().Be(-1);-- string result = consoleOutput.GetOutput().Trim();- result.Should().BeEmpty();- }-- [Fact]- public async Task HashUppercase()- {- _tool.Input = "Hello";- _tool.Uppercase = true;-- using var consoleOutput = new ConsoleOutputMonitor();- int exitCode = await _tool.InvokeAsync(new MockILogger(), CancellationToken.None);- exitCode.Should().Be(0);-- string result = consoleOutput.GetOutput().Trim();- result.Should().Be("8B1A9953C4611296A827ABF8C47804D7");- }-- [Fact]- public async Task HashHmac()- {- _tool.Input = "Hello";- _tool.HmacSecretKey = "secret";-- using var consoleOutput = new ConsoleOutputMonitor();- int exitCode = await _tool.InvokeAsync(new MockILogger(), CancellationToken.None);- exitCode.Should().Be(0);-- string result = consoleOutput.GetOutput().Trim();- result.Should().Be("f386803b6309719e8adad577a10d77c3");- }-- [Fact]- public async Task HashChecksum()- {- _tool.Input = "Hello";- _tool.ChecksumVerification = "8B1A9953C4611296A827ABF8C47804D7";-- using var consoleOutput = new ConsoleOutputMonitor();- int exitCode = await _tool.InvokeAsync(new MockILogger(), CancellationToken.None);- exitCode.Should().Be(0);-- string result = consoleOutput.GetOutput().Trim();- result.Should().Be(HashAndChecksumGenerator.ChecksumVerificationSucceeded);-- _tool.Input = "Hello";- _tool.ChecksumVerification = "foo";-- exitCode = await _tool.InvokeAsync(new MockILogger(), CancellationToken.None);- exitCode.Should().Be(-1);-- result = consoleOutput.GetOutput().Trim();- result.Should().Be(HashAndChecksumGenerator.ChecksumVerificationFailed);-- _tool.Input = "Hello";- _tool.ChecksumVerification = TestDataProvider.GetFile(Path.Combine(_baseTestDataDirectory, "Checksum.txt"));-- exitCode = await _tool.InvokeAsync(new MockILogger(), CancellationToken.None);- exitCode.Should().Be(0);-- result = consoleOutput.GetOutput().Trim();- result.Should().Be(HashAndChecksumGenerator.ChecksumVerificationSucceeded);- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Helpers/Base64HelperTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Helpers/Base64HelperTests.csdeleted file mode 100644index b8ee7186f..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Helpers/Base64HelperTests.cs+++ /dev/null@@ -1,53 +0,0 @@-using System.Threading;-using DevToys.Tools.Helpers;-using DevToys.Tools.Models;--namespace DevToys.UnitTests.Tools.Helpers;--public class Base64HelperTests-{- [Theory]- [InlineData(null, false)]- [InlineData("", false)]- [InlineData(" ", false)]- [InlineData("aGVsbG8gd29ybGQ=", true)]- [InlineData("aGVsbG8gd2f9ybGQ=", false)]- [InlineData("SGVsbG8gV29y", true)]- [InlineData("SGVsbG8gVa29y", false)]- public void IsValid(string input, bool expectedResult)- {- Base64Helper.IsBase64DataStrict(input).Should().Be(expectedResult);- }-- [Theory]- [InlineData(null, "", Base64Encoding.Utf8)]- [InlineData("Hello World!", "SGVsbG8gV29ybGQh", Base64Encoding.Utf8)]- [InlineData("Hello World! é)à", "SGVsbG8gV29ybGQhIMOpKcOg", Base64Encoding.Utf8)]- [InlineData("Hello World! é)à", "SGVsbG8gV29ybGQhID8pPw==", Base64Encoding.Ascii)]- internal void FromTextToBase64(string input, string expectedResult, Base64Encoding encoding)- {- Base64Helper.FromTextToBase64(- input,- encoding,- new MockILogger(),- CancellationToken.None)- .Should()- .Be(expectedResult);- }-- [Theory]- [InlineData(null, "", Base64Encoding.Utf8)]- [InlineData("SGVsbG8gV29ybGQh", "Hello World!", Base64Encoding.Utf8)]- [InlineData("SGVsbG8gV29ybGQhIMOpKcOg", "Hello World! é)à", Base64Encoding.Utf8)]- [InlineData("SGVsbG8gV29ybGQhID8pPw==", "Hello World! ?)?", Base64Encoding.Ascii)]- internal void FromBase64ToText(string input, string expectedResult, Base64Encoding encoding)- {- Base64Helper.FromBase64ToText(- input,- encoding,- new MockILogger(),- CancellationToken.None)- .Should()- .Be(expectedResult);- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Helpers/CertificateHelperTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Helpers/CertificateHelperTests.csdeleted file mode 100644index 17ca7904b..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Helpers/CertificateHelperTests.cs+++ /dev/null@@ -1,88 +0,0 @@-using System.Globalization;-using System.IO;-using System.Text;-using DevToys.Tools.Helpers;-using DevToys.Tools.Tools.EncodersDecoders.Certificate;--namespace DevToys.UnitTests.Tools.Helpers;--public class CertificateHelperTests-{- private static readonly string baseTestDataDirectory = Path.Combine("Tools", "TestData", nameof(CertificateDecoder));-- [Theory]- [InlineData("PemCertPublic.txt", null, true, "CertDecoded.txt")]- [InlineData("PemCertWithPrivateKey.txt", null, true, "CertDecoded.txt")]- [InlineData("PfxNoPassword.pfx", null, true, "CertDecoded.txt")]- [InlineData("PfxWithPassword.pfx", "test1234", true, "CertDecoded.txt")]- [InlineData("PemCertPublicWithExtensions.txt", null, true, "CertWithExtensionsDecoded.txt")]- [InlineData("PemCertWithPrivateKeyWithExtensions.txt", null, true, "CertWithExtensionsDecoded.txt")]- [InlineData("PfxWithExtensionsNoPassword.pfx", null, true, "CertWithExtensionsDecoded.txt")]- public void DecodeCertificateSuccess(string input, string password, bool successfullyDecoded, string expectedResult)- => DecodeCertificate(input, password, successfullyDecoded, expectedResult);-- [Fact]- public void DecodeCertificateErrors()- {- // Cannot populate these vars via DataRow because https://learn.microsoft.com/en-us/dotnet/csharp/misc/cs0182?f1url=%3FappId%3Droslyn%26k%3Dk(CS0182)- DecodeCertificate("PfxWithPassword.pfx", "wrong password!", false, CertificateDecoder.InvalidPasswordError);- DecodeCertificate("CertificateRequest.txt", null, false, CertificateDecoder.UnsupportedFormatError);- }-- private static void DecodeCertificate(string inputFile, string password, bool successfullyDecoded, string expectedResultFile)- {- CultureInfo.CurrentCulture = CultureInfo.InvariantCulture;-- string inputFilePath = TestDataProvider.GetFile(Path.Combine(baseTestDataDirectory, inputFile)).FullName;-- string input;- if (inputFilePath.EndsWith(".pfx", StringComparison.OrdinalIgnoreCase))- {- byte[] data = File.ReadAllBytes(inputFilePath);- input = CertificateHelper.GetRawCertificateString(data);- }- else- {- input = File.ReadAllText(inputFilePath);- }-- string expectedResult;- string expectedResultFilePath = TestDataProvider.GetFile(Path.Combine(baseTestDataDirectory, expectedResultFile)).FullName;- if (File.Exists(expectedResultFilePath))- {- expectedResult = File.ReadAllText(TestDataProvider.GetFile(Path.Combine(baseTestDataDirectory, expectedResultFile)).FullName);- }- else- {- expectedResult = expectedResultFile;- }-- bool result = CertificateHelper.TryDecodeCertificate(new MockILogger(), input, password, out string decoded);- decoded = CleanDateTimes(decoded);- expectedResult = CleanDateTimes(expectedResult);-- result.Should().Be(successfullyDecoded);- expectedResult.Should().Be(decoded);- }-- /// <summary>- /// Strips times from decoded certificates to avoid issues with testing in different timezones- /// </summary>- internal static string CleanDateTimes(string decoded)- {- var decodedCleaned = new StringBuilder();- foreach (string line in decoded.Split(new string[] { "\r\n", "\r", "\n" }, StringSplitOptions.None))- {- if (DateTime.TryParse(line, out DateTime dateTime))- {- decodedCleaned.AppendLine($" {dateTime.Date}");- }- else- {- decodedCleaned.AppendLine(line);- }- }-- return decodedCleaned.ToString();- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Helpers/DateTimeHelperTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Helpers/DateTimeHelperTests.csdeleted file mode 100644index 5397a7d1e..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Helpers/DateTimeHelperTests.cs+++ /dev/null@@ -1,384 +0,0 @@-using System.Globalization;-using DevToys.Tools.Helpers;-using DevToys.Tools.Models;--namespace DevToys.UnitTests.Tools.Helpers;--public class DateHelperTests-{- #region ConvertToLong-- [Theory]- [InlineData("1970-01-01T00:00:00.000Z", 0)]- [InlineData("2023-11-22T19:58:07.000Z", 1700683087)]- [InlineData("1900-11-22T19:58:07.000Z", -2180836913)]- public void ConvertToLongUtcUsingUnixEpochInSeconds(string dateTimeString, long timestamp)- {- var dateTime = DateTimeOffset.Parse(dateTimeString, CultureInfo.InvariantCulture);- DateTimeOffset epoch = DateTimeOffset.UnixEpoch;-- ResultInfo<long> result = DateHelper.ConvertToLong(dateTime, epoch, DateFormat.Seconds);- result.Data.Should().Be(timestamp);- }-- [Theory]- [InlineData("1970-01-01T00:00:00.000Z", 0)]- [InlineData("2023-11-22T19:58:07.000Z", 1700683087000)]- [InlineData("1900-11-22T19:58:07.000Z", -2180836913000)]- public void ConvertToLongUtcUsingUnixEpochInMilliseconds(string dateTimeString, long timestamp)- {- var dateTime = DateTimeOffset.Parse(dateTimeString, CultureInfo.InvariantCulture);- DateTimeOffset epoch = DateTimeOffset.UnixEpoch;-- ResultInfo<long> result = DateHelper.ConvertToLong(dateTime, epoch, DateFormat.Milliseconds);- result.Data.Should().Be(timestamp);- }-- [Theory]- [InlineData("1970-01-01T00:00:00.000Z", 621355968000000000)]- [InlineData("2023-11-22T19:58:07.000Z", 638362798870000000)]- [InlineData("2022-06-15T03:23:50.000Z", 637908602300000000)]- [InlineData("1900-11-22T19:58:07.000Z", 599547598870000000)]- public void ConvertToLongUtcUsingUnixEpochInTicks(string dateTimeString, long timestamp)- {- var dateTime = DateTimeOffset.Parse(dateTimeString, CultureInfo.InvariantCulture);- DateTimeOffset epoch = DateTimeOffset.UnixEpoch;-- ResultInfo<long> result = DateHelper.ConvertToLong(dateTime, epoch, DateFormat.Ticks);- result.Data.Should().Be(timestamp);- }-- [Theory]- [InlineData("1970-01-01T00:00:00.000Z", 0)]- [InlineData("2023-11-22T19:58:07.000Z", 1700683087)]- [InlineData("1900-11-22T19:58:07.000Z", -2180836913)]- public void ConvertToLongLocalUsingUnixEpochInSeconds(string dateTimeString, long timestamp)- {- var dateTime = DateTimeOffset.Parse(dateTimeString, CultureInfo.CurrentCulture);- DateTimeOffset epoch = DateTimeOffset.UnixEpoch;-- ResultInfo<long> result = DateHelper.ConvertToLong(dateTime, epoch, DateFormat.Seconds);- result.Data.Should().Be(timestamp);- }-- [Theory]- [InlineData("1970-01-01T00:00:00.000Z", 0)]- [InlineData("2023-11-22T19:58:07.000Z", 1700683087000)]- [InlineData("1900-11-22T19:58:07.000Z", -2180836913000)]- public void ConvertToLongLocalUsingUnixEpochInMilliseconds(string dateTimeString, long timestamp)- {- var dateTime = DateTimeOffset.Parse(dateTimeString, CultureInfo.CurrentCulture);- DateTimeOffset epoch = DateTimeOffset.UnixEpoch;-- ResultInfo<long> result = DateHelper.ConvertToLong(dateTime, epoch, DateFormat.Milliseconds);- result.Data.Should().Be(timestamp);- }-- [Theory]- [InlineData("1970-01-01T00:00:00.000Z", 621355968000000000)]- [InlineData("2023-11-22T19:58:07.000Z", 638362798870000000)]- [InlineData("2022-06-15T03:23:50.000Z", 637908602300000000)]- [InlineData("1900-11-22T19:58:07.000Z", 599547598870000000)]- public void ConvertToLongLocalUsingUnixEpochInTicks(string dateTimeString, long timestamp)- {- var dateTime = DateTimeOffset.Parse(dateTimeString, CultureInfo.CurrentCulture);- DateTimeOffset epoch = DateTimeOffset.UnixEpoch;-- ResultInfo<long> result = DateHelper.ConvertToLong(dateTime, epoch, DateFormat.Ticks);- result.Data.Should().Be(timestamp);- }-- [Theory]- [InlineData("1970-01-01T00:00:00.000Z", "1870-01-01T00:00:00.000Z", 3155673600L)]- [InlineData("2023-11-22T19:58:07.000Z", "1870-01-01T00:00:00.000Z", 4856356687L)]- [InlineData("1900-11-22T19:58:07.000Z", "1870-01-01T00:00:00.000Z", 974836687L)]- public void ConvertToLongUtcUsingCustomEpochInSeconds(string dateTimeString, string epochString, long timestamp)- {- var dateTime = DateTimeOffset.Parse(dateTimeString, CultureInfo.InvariantCulture);- var epoch = DateTimeOffset.Parse(epochString, CultureInfo.InvariantCulture);-- ResultInfo<long> result = DateHelper.ConvertToLong(dateTime, epoch, DateFormat.Seconds);- result.Data.Should().Be(timestamp);- }-- [Theory]- [InlineData("1970-01-01T00:00:00.000Z", "1870-01-01T00:00:00.000Z", 3155673600000L)]- [InlineData("2023-11-22T19:58:07.000Z", "1870-01-01T00:00:00.000Z", 4856356687000L)]- [InlineData("1900-11-22T19:58:07.000Z", "1870-01-01T00:00:00.000Z", 974836687000L)]- public void ConvertToLongUtcUsingCustomEpochInMilliseconds(string dateTimeString, string epochString, long timestamp)- {- var dateTime = DateTimeOffset.Parse(dateTimeString, CultureInfo.InvariantCulture);- var epoch = DateTimeOffset.Parse(epochString, CultureInfo.InvariantCulture);-- ResultInfo<long> result = DateHelper.ConvertToLong(dateTime, epoch, DateFormat.Milliseconds);- result.Data.Should().Be(timestamp);- }-- [Theory]- [InlineData("1970-01-01T00:00:00.000Z", "1870-01-01T00:00:00.000Z", 621355968000000000)]- [InlineData("2023-11-22T19:58:07.000Z", "1870-01-01T00:00:00.000Z", 638362798870000000)]- [InlineData("2022-06-15T03:23:50.000Z", "1870-01-01T00:00:00.000Z", 637908602300000000)]- [InlineData("1900-11-22T19:58:07.000Z", "1970-01-01T00:00:00.000Z", 599547598870000000)]- public void ConvertToLongUtcUsingCustomEpochInTicks(string dateTimeString, string epochString, long timestamp)- {- var dateTime = DateTimeOffset.Parse(dateTimeString, CultureInfo.InvariantCulture);- var epoch = DateTimeOffset.Parse(epochString, CultureInfo.InvariantCulture);-- ResultInfo<long> result = DateHelper.ConvertToLong(dateTime, epoch, DateFormat.Ticks);- result.Data.Should().Be(timestamp);- }-- [Theory]- [InlineData("1970-01-01T00:00:00.000Z", "1870-01-01T00:00:00.000Z", 3155673600L)]- [InlineData("2023-11-22T19:58:07.000Z", "1870-01-01T00:00:00.000Z", 4856356687L)]- [InlineData("1900-11-22T19:58:07.000Z", "1870-01-01T00:00:00.000Z", 974836687L)]- public void ConvertToLongLocalUsingCustomEpochInSeconds(string dateTimeString, string epochString, long timestamp)- {- var dateTime = DateTimeOffset.Parse(dateTimeString, CultureInfo.CurrentCulture);- var epoch = DateTimeOffset.Parse(epochString, CultureInfo.InvariantCulture);-- ResultInfo<long> result = DateHelper.ConvertToLong(dateTime, epoch, DateFormat.Seconds);- result.Data.Should().Be(timestamp);- }-- [Theory]- [InlineData("1970-01-01T00:00:00.000Z", "1870-01-01T00:00:00.000Z", 3155673600000L)]- [InlineData("2023-11-22T19:58:07.000Z", "1870-01-01T00:00:00.000Z", 4856356687000L)]- [InlineData("1900-11-22T19:58:07.000Z", "1870-01-01T00:00:00.000Z", 974836687000L)]- public void ConvertToLongLocalUsingCustomEpochInMilliseconds(string dateTimeString, string epochString, long timestamp)- {- var dateTime = DateTimeOffset.Parse(dateTimeString, CultureInfo.CurrentCulture);- var epoch = DateTimeOffset.Parse(epochString, CultureInfo.InvariantCulture);-- ResultInfo<long> result = DateHelper.ConvertToLong(dateTime, epoch, DateFormat.Milliseconds);- result.Data.Should().Be(timestamp);- }-- [Theory]- [InlineData("1970-01-01T00:00:00.000Z", "1870-01-01T00:00:00.000Z", 621355968000000000)]- [InlineData("2023-11-22T19:58:07.000Z", "1870-01-01T00:00:00.000Z", 638362798870000000)]- [InlineData("2022-06-15T03:23:50.000Z", "1870-01-01T00:00:00.000Z", 637908602300000000)]- [InlineData("1900-11-22T19:58:07.000Z", "1970-01-01T00:00:00.000Z", 599547598870000000)]- public void ConvertToLongLocalUsingCustomEpochInTicks(string dateTimeString, string epochString, long timestamp)- {- var dateTime = DateTimeOffset.Parse(dateTimeString, CultureInfo.CurrentCulture);- var epoch = DateTimeOffset.Parse(epochString, CultureInfo.InvariantCulture);-- ResultInfo<long> result = DateHelper.ConvertToLong(dateTime, epoch, DateFormat.Ticks);- result.Data.Should().Be(timestamp);- }-- #endregion-- #region ConvertToDateTime-- [Theory]- [InlineData("1970-01-01T00:00:00.000Z", 0)]- [InlineData("2023-11-22T19:58:07.000Z", 1700683087)]- [InlineData("1900-11-22T19:58:07.000Z", -2180836913)]- public void ConvertToDateTimeUtcUsingUnixEpochInSeconds(string dateTimeString, long timestamp)- {- var dateTime = DateTimeOffset.Parse(dateTimeString, CultureInfo.InvariantCulture);- DateTimeOffset epoch = DateTimeOffset.UnixEpoch;-- ResultInfo<DateTimeOffset> result = DateHelper.ConvertToDateTimeUtc(timestamp, epoch, DateFormat.Seconds);- result.Data.Should().Be(dateTime);- }-- [Theory]- [InlineData("1970-01-01T00:00:00.000Z", 0)]- [InlineData("2023-11-22T19:58:07.000Z", 1700683087000)]- [InlineData("1900-11-22T19:58:07.000Z", -2180836913000)]- public void ConvertToDateTimeUtcUsingUnixEpochInMilliseconds(string dateTimeString, long timestamp)- {- var dateTime = DateTimeOffset.Parse(dateTimeString, CultureInfo.InvariantCulture);- DateTimeOffset epoch = DateTimeOffset.UnixEpoch;-- ResultInfo<DateTimeOffset> result = DateHelper.ConvertToDateTimeUtc(timestamp, epoch, DateFormat.Milliseconds);- result.Data.Should().Be(dateTime);- }-- [Theory]- [InlineData("1970-01-01T00:00:00.000Z", 621355968000000000)]- [InlineData("2023-11-22T19:58:07.000Z", 638362798870000000)]- [InlineData("2022-06-15T03:23:50.000Z", 637908602300000000)]- [InlineData("1900-11-22T19:58:07.000Z", 599547598870000000)]- public void ConvertToDateTimeUtcUsingUnixEpochInTicks(string dateTimeString, long timestamp)- {- var dateTime = DateTimeOffset.Parse(dateTimeString, CultureInfo.InvariantCulture);- DateTimeOffset epoch = DateTimeOffset.UnixEpoch;-- ResultInfo<DateTimeOffset> result = DateHelper.ConvertToDateTimeUtc(timestamp, epoch, DateFormat.Ticks);- result.Data.Should().Be(dateTime);- }-- [Theory]- [InlineData("1970-01-01T00:00:00.000Z", 0)]- [InlineData("2023-11-22T19:58:07.000Z", 1700683087)]- [InlineData("1900-11-22T19:58:07.000Z", -2180836913)]- public void ConvertToDateTimeLocalUsingUnixEpochInSeconds(string dateTimeString, long timestamp)- {- var dateTime = DateTimeOffset.Parse(dateTimeString, CultureInfo.CurrentCulture);- DateTimeOffset epoch = DateTimeOffset.UnixEpoch;-- ResultInfo<DateTimeOffset> result = DateHelper.ConvertToDateTimeUtc(timestamp, epoch, DateFormat.Seconds);- result.Data.Should().Be(dateTime);- }-- [Theory]- [InlineData("1970-01-01T00:00:00.000Z", 0)]- [InlineData("2023-11-22T19:58:07.000Z", 1700683087000)]- [InlineData("1900-11-22T19:58:07.000Z", -2180836913000)]- public void ConvertToDateTimeLocalUsingUnixEpochInMilliseconds(string dateTimeString, long timestamp)- {- var dateTime = DateTimeOffset.Parse(dateTimeString, CultureInfo.CurrentCulture);- DateTimeOffset epoch = DateTimeOffset.UnixEpoch;-- ResultInfo<DateTimeOffset> result = DateHelper.ConvertToDateTimeUtc(timestamp, epoch, DateFormat.Milliseconds);- result.Data.Should().Be(dateTime);- }-- [Theory]- [InlineData("1970-01-01T00:00:00.000Z", 621355968000000000)]- [InlineData("2023-11-22T19:58:07.000Z", 638362798870000000)]- [InlineData("2022-06-15T03:23:50.000Z", 637908602300000000)]- [InlineData("1900-11-22T19:58:07.000Z", 599547598870000000)]- public void ConvertToDateTimeLocalUsingUnixEpochInTicks(string dateTimeString, long timestamp)- {- var dateTime = DateTimeOffset.Parse(dateTimeString, CultureInfo.CurrentCulture);- DateTimeOffset epoch = DateTimeOffset.UnixEpoch;-- ResultInfo<DateTimeOffset> result = DateHelper.ConvertToDateTimeUtc(timestamp, epoch, DateFormat.Ticks);- result.Data.Should().Be(dateTime);- }-- [Theory]- [InlineData("1970-01-01T00:00:00.000Z", "1870-01-01T00:00:00.000Z", 3155673600L)]- [InlineData("2023-11-22T19:58:07.000Z", "1870-01-01T00:00:00.000Z", 4856356687L)]- [InlineData("1900-11-22T19:58:07.000Z", "1870-01-01T00:00:00.000Z", 974836687L)]- public void ConvertToDateTimeUtcUsingCustomEpochInSeconds(string dateTimeString, string epochString, long timestamp)- {- var dateTime = DateTimeOffset.Parse(dateTimeString, CultureInfo.InvariantCulture);- var epoch = DateTimeOffset.Parse(epochString, CultureInfo.InvariantCulture);-- ResultInfo<DateTimeOffset> result = DateHelper.ConvertToDateTimeUtc(timestamp, epoch, DateFormat.Seconds);- result.HasSucceeded.Should().BeTrue();- result.Data.Should().Be(dateTime);- }-- [Theory]- [InlineData("1970-01-01T00:00:00.000Z", "1870-01-01T00:00:00.000Z", 3155673600000L)]- [InlineData("2023-11-22T19:58:07.000Z", "1870-01-01T00:00:00.000Z", 4856356687000L)]- [InlineData("1900-11-22T19:58:07.000Z", "1870-01-01T00:00:00.000Z", 974836687000L)]- public void ConvertToDateTimeUtcUsingCustomEpochInMilliseconds(string dateTimeString, string epochString, long timestamp)- {- var dateTime = DateTimeOffset.Parse(dateTimeString, CultureInfo.InvariantCulture);- var epoch = DateTimeOffset.Parse(epochString, CultureInfo.InvariantCulture);-- ResultInfo<DateTimeOffset> result = DateHelper.ConvertToDateTimeUtc(timestamp, epoch, DateFormat.Milliseconds);- result.HasSucceeded.Should().BeTrue();- result.Data.Should().Be(dateTime);- }-- [Theory]- [InlineData("1970-01-01T00:00:00.000Z", "1870-01-01T00:00:00.000Z", 621355968000000000)]- [InlineData("2023-11-22T19:58:07.000Z", "1870-01-01T00:00:00.000Z", 638362798870000000)]- [InlineData("2022-06-15T03:23:50.000Z", "1870-01-01T00:00:00.000Z", 637908602300000000)]- [InlineData("1900-11-22T19:58:07.000Z", "1970-01-01T00:00:00.000Z", 599547598870000000)]- public void ConvertToDateTimeUtcUsingCustomEpochInTicks(string dateTimeString, string epochString, long timestamp)- {- var dateTime = DateTimeOffset.Parse(dateTimeString, CultureInfo.InvariantCulture);- var epoch = DateTimeOffset.Parse(epochString, CultureInfo.InvariantCulture);-- ResultInfo<DateTimeOffset> result = DateHelper.ConvertToDateTimeUtc(timestamp, epoch, DateFormat.Ticks);- result.HasSucceeded.Should().BeTrue();- result.Data.Should().Be(dateTime);- }-- [Theory]- [InlineData("1970-01-01T00:00:00.000Z", "1870-01-01T00:00:00.000Z", 3155673600L)]- [InlineData("2023-11-22T19:58:07.000Z", "1870-01-01T00:00:00.000Z", 4856356687L)]- [InlineData("1900-11-22T19:58:07.000Z", "1870-01-01T00:00:00.000Z", 974836687L)]- public void ConvertToDateTimeLocalUsingCustomEpochInSeconds(string dateTimeString, string epochString, long timestamp)- {- var dateTime = DateTimeOffset.Parse(dateTimeString, CultureInfo.CurrentCulture);- var epoch = DateTimeOffset.Parse(epochString, CultureInfo.InvariantCulture);-- ResultInfo<DateTimeOffset> result = DateHelper.ConvertToDateTimeUtc(timestamp, epoch, DateFormat.Seconds);- result.HasSucceeded.Should().BeTrue();- result.Data.Should().Be(dateTime);- }-- [Theory]- [InlineData("1970-01-01T00:00:00.000Z", "1870-01-01T00:00:00.000Z", 3155673600000L)]- [InlineData("2023-11-22T19:58:07.000Z", "1870-01-01T00:00:00.000Z", 4856356687000L)]- [InlineData("1900-11-22T19:58:07.000Z", "1870-01-01T00:00:00.000Z", 974836687000L)]- public void ConvertToDateTimeLocalUsingCustomEpochInMilliseconds(string dateTimeString, string epochString, long timestamp)- {- var dateTime = DateTimeOffset.Parse(dateTimeString, CultureInfo.CurrentCulture);- var epoch = DateTimeOffset.Parse(epochString, CultureInfo.InvariantCulture);-- ResultInfo<DateTimeOffset> result = DateHelper.ConvertToDateTimeUtc(timestamp, epoch, DateFormat.Milliseconds);- result.HasSucceeded.Should().BeTrue();- result.Data.Should().Be(dateTime);- }-- [Theory]- [InlineData("1970-01-01T00:00:00.000Z", "1870-01-01T00:00:00.000Z", 621355968000000000)]- [InlineData("2023-11-22T19:58:07.000Z", "1870-01-01T00:00:00.000Z", 638362798870000000)]- [InlineData("2022-06-15T03:23:50.000Z", "1870-01-01T00:00:00.000Z", 637908602300000000)]- [InlineData("1900-11-22T19:58:07.000Z", "1970-01-01T00:00:00.000Z", 599547598870000000)]- public void ConvertToDateTimeLocalUsingCustomEpochInTicks(string dateTimeString, string epochString, long timestamp)- {- var dateTime = DateTimeOffset.Parse(dateTimeString, CultureInfo.CurrentCulture);- var epoch = DateTimeOffset.Parse(epochString, CultureInfo.InvariantCulture);-- ResultInfo<DateTimeOffset> result = DateHelper.ConvertToDateTimeUtc(timestamp, epoch, DateFormat.Ticks);- result.HasSucceeded.Should().BeTrue();- result.Data.Should().Be(dateTime);- }-- #endregion-- [Fact]- public void ChangeDateTimeWithInvalidValueShouldReturnDateTimeOffsetNow()- {- ResultInfo<DateTimeOffset> result = DateHelper.ChangeDateTime(- -1,- DateTime.Parse("1970-01-01T00:00:00.000Z"),- TimeZoneInfo.Utc,- DateValueType.Year);- result.HasSucceeded.Should().BeTrue();- result.Data.Should().BeCloseTo(DateTimeOffset.Now, TimeSpan.FromSeconds(10));- }-- [Theory]- [InlineData("1970-01-01T00:00:00.000Z", 1971, "1971-01-01T00:00:00.000Z")]- [InlineData("2023-02-28T00:00:00.000Z", 2024, "2024-02-28T00:00:00.000Z")]- [InlineData("2024-02-29T00:00:00.000Z", 2023, "2023-02-28T00:00:00.000Z")]- public void ChangeDateTimeWithInvalidValueShouldReturnDateTimeOffsetChangedInYear(- string dateTimeString, int value, string expectedDateTimeString)- {- var dateTime = DateTimeOffset.Parse(dateTimeString);- var expectedDateTime = DateTimeOffset.Parse(expectedDateTimeString);- TimeZoneInfo timeZone = TimeZoneInfo.Utc;-- ResultInfo<DateTimeOffset> result = DateHelper.ChangeDateTime(value, dateTime, timeZone, DateValueType.Year);- result.HasSucceeded.Should().BeTrue();- result.Data.Should().Be(expectedDateTime);- }-- [Theory]- [InlineData("2023-12-31T23:59:59.000Z", 1000, "2024-01-01T00:00:00.000Z")]- public void ChangeDateTimeWithInvalidValueShouldReturnDateTimeOffsetChangedInMillisecond(- string dateTimeString, int value, string expectedDateTimeString)- {- var dateTime = DateTimeOffset.Parse(dateTimeString);- var expectedDateTime = DateTimeOffset.Parse(expectedDateTimeString);- TimeZoneInfo timeZone = TimeZoneInfo.Utc;-- ResultInfo<DateTimeOffset> result = DateHelper.ChangeDateTime(value, dateTime, timeZone, DateValueType.Millisecond);- result.HasSucceeded.Should().BeTrue();- result.Data.Should().Be(expectedDateTime);- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Helpers/GZipHelperTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Helpers/GZipHelperTests.csdeleted file mode 100644index 47d33c274..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Helpers/GZipHelperTests.cs+++ /dev/null@@ -1,61 +0,0 @@-using System.Threading;-using System.Threading.Tasks;-using DevToys.Tools.Helpers;--namespace DevToys.UnitTests.Tools.Helpers;--public class GZipHelperTests-{- [Theory]- [InlineData(null, false)]- [InlineData("", false)]- [InlineData(" ", false)]- [InlineData(" ", false)]- [InlineData("H4sIAAAAAAAAC/NIzcnJBwCCidH3BQAAAA==", true)]- [InlineData(" H4sIAAAAAAAAC/NIzcnJBwCCidH3BQAAAA==", true)]- [InlineData(" H4sIAAAAAAAAC/NIzcnJBwCCidH3BQAAAA==", true)]- [InlineData("H4sI", true)]- [InlineData("H4sIA", true)]- [InlineData("H4s", false)]- public void IsValid(string input, bool expectedResult)- {- GZipHelper.IsGZip(input).Should().Be(expectedResult);- }-- [Theory]- [InlineData(null, "")]- [InlineData("", "H4sIAAAAAAAACgMAAAAAAAAAAAA=")]- [InlineData(" ", "H4sIAAAAAAAAClNQAACVFjPvAgAAAA==")]- [InlineData("Hello World!", "H4sIAAAAAAAACvNIzcnJVwjPL8pJUQQAoxwpHAwAAAA=")]- [InlineData("Hello World! é)à", "H4sIAAAAAAAACvNIzcnJVwjPL8pJUVQ4vFLz8AIAeJm72xIAAAA=")]- [InlineData("H4sIAAAAAAAACvNIzcnJVwjPL8pJUVQ4vFLz8AIAeJm72xIAAAA=", "H4sIAAAAAAAACvMwKfZ0hALnMj/PquQ8r7DyrAAfiwKv0LBAkzI3nyoLR0/HVK9cc6MKsFJbAI7LDrY0AAAA")]- internal async Task CompressToGZip(string input, string expectedResult)- {- (await GZipHelper.CompressGZipDataAsync(- input,- new MockILogger(),- CancellationToken.None))- .compressedData- .Should()- .Be(expectedResult);- }-- [Theory]- [InlineData(null, "")]- [InlineData("H4sIAAAAAAAACgMAAAAAAAAAAAA=", "")]- [InlineData("H4sIAAAAAAAAClNQAACVFjPvAgAAAA==", " ")]- [InlineData("H4sIAAAAAAAACvNIzcnJVwjPL8pJUQQAoxwpHAwAAAA=", "Hello World!")]- [InlineData("H4sIAAAAAAAACvNIzcnJVwjPL8pJUVQ4vFLz8AIAeJm72xIAAAA=", "Hello World! é)à")]- [InlineData("H4sIAAAAAAAACvMwKfZ0hALnMj/PquQ8r7DyrAAfiwKv0LBAkzI3nyoLR0/HVK9cc6MKsFJbAI7LDrY0AAAA", "H4sIAAAAAAAACvNIzcnJVwjPL8pJUVQ4vFLz8AIAeJm72xIAAAA=")]- [InlineData("Hello", "<Invalid GZip data>")]- internal async Task DecompressGZip(string input, string expectedResult)- {- (await GZipHelper.DecompressGZipDataAsync(- input,- new MockILogger(),- CancellationToken.None))- .decompressedData- .Should()- .Be(expectedResult);- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Helpers/HashingHelperTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Helpers/HashingHelperTests.csdeleted file mode 100644index dc49b1373..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Helpers/HashingHelperTests.cs+++ /dev/null@@ -1,187 +0,0 @@-using System.IO;-using System.Security.Cryptography;-using System.Text;-using System.Threading;-using System.Threading.Tasks;-using DevToys.Tools.Helpers;-using DevToys.Tools.Models;--namespace DevToys.UnitTests.Tools.Helpers;--public class HashingHelperTests-{- private static readonly byte[] twoMBArray = Enumerable.Repeat<byte>(1, 1024 * 1024 * 2).ToArray();-- [Fact]- public void ComputeHashShouldThrowIfStreamIsNull()- {- Action act- = () =>- HashingHelper.ComputeHashAsync(- MD5.Create(),- null,- new Progress<HashingProgress>((_) => { }), CancellationToken.None)- .CompleteOnCurrentThread();-- act- .Should()- .Throw<ArgumentNullException>()- .Which.ParamName- .Should()- .Be("stream");- }-- [Fact]- public void ComputeHashShouldThrowIfHashingAlgorithmIsNull()- {- using var stream = new MemoryStream();-- Action act- = () =>- HashingHelper.ComputeHashAsync(- null,- stream,- new Progress<HashingProgress>((_) => { }),- CancellationToken.None)- .CompleteOnCurrentThread();-- act- .Should()- .Throw<ArgumentNullException>()- .Which.ParamName- .Should()- .Be("hashAlgorithm");- }-- [Theory]- [InlineData("", "D41D8CD98F00B204E9800998ECF8427E")]- [InlineData(" ", "7215EE9C7D9DC229D2921A40E899EC5F")]- [InlineData("Hello World", "B10A8DB164E0754105B7A99BE72E3FE5")]- [InlineData("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam cursus nec metus vel sagittis. Donec auctor nulla tortor. Praesent pretium, nunc vel porttitor tempor, metus eros pharetra orci, vitae lobortis ligula massa eu libero. Maecenas faucibus dolor ante, non ullamcorper urna blandit nec. Maecenas at pulvinar neque, a fermentum sapien. Curabitur mattis massa leo, a hendrerit lectus condimentum eget. Etiam nec scelerisque tellus. Quisque ligula erat, porttitor quis mi id, vehicula feugiat est.", "02868AD2F0787EF5323B221DBD14BAB2")]- public async Task ComputeHashMD5(string input, string expectedResult)- {- using var stream = new MemoryStream(Encoding.UTF8.GetBytes(input));- byte[] bytesResult = await HashingHelper.ComputeHashAsync(MD5.Create(), stream, new Progress<HashingProgress>((_) => { }), CancellationToken.None);-- string result = FormatResult(BitConverter.ToString(bytesResult));-- result.Should().Be(expectedResult);- }-- [Fact]- public async Task ComputeHashMD5ForLargeFile()- {- using var stream = new MemoryStream(twoMBArray);- byte[] bytesResult = await HashingHelper.ComputeHashAsync(MD5.Create(), stream, new Progress<HashingProgress>((_) => { }), CancellationToken.None);-- string result = FormatResult(BitConverter.ToString(bytesResult));-- result.Should().Be("9F05E7ADB91551CA82CF646CA371344A");- }-- [Theory]- [InlineData("", "DA39A3EE5E6B4B0D3255BFEF95601890AFD80709")]- [InlineData(" ", "B858CB282617FB0956D960215C8E84D1CCF909C6")]- [InlineData("Hello World", "0A4D55A8D778E5022FAB701977C5D840BBC486D0")]- [InlineData("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam cursus nec metus vel sagittis. Donec auctor nulla tortor. Praesent pretium, nunc vel porttitor tempor, metus eros pharetra orci, vitae lobortis ligula massa eu libero. Maecenas faucibus dolor ante, non ullamcorper urna blandit nec. Maecenas at pulvinar neque, a fermentum sapien. Curabitur mattis massa leo, a hendrerit lectus condimentum eget. Etiam nec scelerisque tellus. Quisque ligula erat, porttitor quis mi id, vehicula feugiat est.", "DBFE62B3C0817383AC870AACC61DD016BC599689")]- public async Task ComputeHashSHA1(string input, string expectedResult)- {- using var stream = new MemoryStream(Encoding.UTF8.GetBytes(input));- byte[] bytesResult = await HashingHelper.ComputeHashAsync(SHA1.Create(), stream, new Progress<HashingProgress>((_) => { }), CancellationToken.None);-- string result = FormatResult(BitConverter.ToString(bytesResult));-- result.Should().Be(expectedResult);- }-- [Fact]- public async Task ComputeHashSHA1ForLargeFile()- {- using var stream = new MemoryStream(twoMBArray);- byte[] bytesResult = await HashingHelper.ComputeHashAsync(SHA1.Create(), stream, new Progress<HashingProgress>((_) => { }), CancellationToken.None);-- string result = FormatResult(BitConverter.ToString(bytesResult));-- result.Should().Be("F613FCBB54EF5E04D50D734FB0457B245833702B");- }-- [Theory]- [InlineData("", "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855")]- [InlineData(" ", "36A9E7F1C95B82FFB99743E0C5C4CE95D83C9A430AAC59F84EF3CBFAB6145068")]- [InlineData("Hello World", "A591A6D40BF420404A011733CFB7B190D62C65BF0BCDA32B57B277D9AD9F146E")]- [InlineData("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam cursus nec metus vel sagittis. Donec auctor nulla tortor. Praesent pretium, nunc vel porttitor tempor, metus eros pharetra orci, vitae lobortis ligula massa eu libero. Maecenas faucibus dolor ante, non ullamcorper urna blandit nec. Maecenas at pulvinar neque, a fermentum sapien. Curabitur mattis massa leo, a hendrerit lectus condimentum eget. Etiam nec scelerisque tellus. Quisque ligula erat, porttitor quis mi id, vehicula feugiat est.", "FD5800A6B0C7EE959AFE2CC011DFD9E9A48E9E4FB80828412F7AFC77A3A97782")]- public async Task ComputeHashSHA256(string input, string expectedResult)- {- using var stream = new MemoryStream(Encoding.UTF8.GetBytes(input));- byte[] bytesResult = await HashingHelper.ComputeHashAsync(SHA256.Create(), stream, new Progress<HashingProgress>((_) => { }), CancellationToken.None);-- string result = FormatResult(BitConverter.ToString(bytesResult));-- result.Should().Be(expectedResult);- }-- [Fact]- public async Task ComputeHashSHA256ForLargeFile()- {- using var stream = new MemoryStream(twoMBArray);- byte[] bytesResult = await HashingHelper.ComputeHashAsync(SHA256.Create(), stream, new Progress<HashingProgress>((_) => { }), CancellationToken.None);-- string result = FormatResult(BitConverter.ToString(bytesResult));-- result.Should().Be("6D75695D93DEB1BF5805617CFBA166466CF60DC0A99A8014FA58893F358F33B8");- }-- [Theory]- [InlineData("", "38B060A751AC96384CD9327EB1B1E36A21FDB71114BE07434C0CC7BF63F6E1DA274EDEBFE76F65FBD51AD2F14898B95B")]- [InlineData(" ", "588016EB10045DD85834D67D187D6B97858F38C58C690320C4A64E0C2F92EEBD9F1BD74DE256E8268815905159449566")]- [InlineData("Hello World", "99514329186B2F6AE4A1329E7EE6C610A729636335174AC6B740F9028396FCC803D0E93863A7C3D90F86BEEE782F4F3F")]- [InlineData("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam cursus nec metus vel sagittis. Donec auctor nulla tortor. Praesent pretium, nunc vel porttitor tempor, metus eros pharetra orci, vitae lobortis ligula massa eu libero. Maecenas faucibus dolor ante, non ullamcorper urna blandit nec. Maecenas at pulvinar neque, a fermentum sapien. Curabitur mattis massa leo, a hendrerit lectus condimentum eget. Etiam nec scelerisque tellus. Quisque ligula erat, porttitor quis mi id, vehicula feugiat est.", "D775DFC327D966FE31F96B82A618A3F41CBB5FD9A05106CCD60F433D8079B8EA67546E6BA0501E29A6C9D6355A11A00C")]- public async Task ComputeHashSHA384(string input, string expectedResult)- {- using var stream = new MemoryStream(Encoding.UTF8.GetBytes(input));- byte[] bytesResult = await HashingHelper.ComputeHashAsync(SHA384.Create(), stream, new Progress<HashingProgress>((_) => { }), CancellationToken.None);-- string result = FormatResult(BitConverter.ToString(bytesResult));-- result.Should().Be(expectedResult);- }-- [Fact]- public async Task ComputeHashSHA384ForLargeFile()- {- using var stream = new MemoryStream(twoMBArray);- byte[] bytesResult = await HashingHelper.ComputeHashAsync(SHA384.Create(), stream, new Progress<HashingProgress>((_) => { }), CancellationToken.None);-- string result = FormatResult(BitConverter.ToString(bytesResult));-- result.Should().Be("DBC3E43FA05876C686A500F648D815B4CEEE99C1761C58EFB031C8E439884D0C4363C8BC56A9F9AD5343B4E8EFDE6D37");- }-- [Theory]- [InlineData("", "CF83E1357EEFB8BDF1542850D66D8007D620E4050B5715DC83F4A921D36CE9CE47D0D13C5D85F2B0FF8318D2877EEC2F63B931BD47417A81A538327AF927DA3E")]- [InlineData(" ", "F90DDD77E400DFE6A3FCF479B00B1EE29E7015C5BB8CD70F5F15B4886CC339275FF553FC8A053F8DDC7324F45168CFFAF81F8C3AC93996F6536EEF38E5E40768")]- [InlineData("Hello World", "2C74FD17EDAFD80E8447B0D46741EE243B7EB74DD2149A0AB1B9246FB30382F27E853D8585719E0E67CBDA0DAA8F51671064615D645AE27ACB15BFB1447F459B")]- [InlineData("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam cursus nec metus vel sagittis. Donec auctor nulla tortor. Praesent pretium, nunc vel porttitor tempor, metus eros pharetra orci, vitae lobortis ligula massa eu libero. Maecenas faucibus dolor ante, non ullamcorper urna blandit nec. Maecenas at pulvinar neque, a fermentum sapien. Curabitur mattis massa leo, a hendrerit lectus condimentum eget. Etiam nec scelerisque tellus. Quisque ligula erat, porttitor quis mi id, vehicula feugiat est.", "9BE8DB4FE9A776337D500BAA2E99A23C41CDEA2E0D0F445EB72DC8C6BEFAADF9FB5FA4C14BA81E93716F24C004477F08ABF684B3E50F0365C63AE602136E56B5")]- public async Task ComputeHashSHA512(string input, string expectedResult)- {- using var stream = new MemoryStream(Encoding.UTF8.GetBytes(input));- byte[] bytesResult = await HashingHelper.ComputeHashAsync(SHA512.Create(), stream, new Progress<HashingProgress>((_) => { }), CancellationToken.None);-- string result = FormatResult(BitConverter.ToString(bytesResult));-- result.Should().Be(expectedResult);- }-- [Fact]- public async Task ComputeHashSHA512ForLargeFile()- {- using var stream = new MemoryStream(twoMBArray);- byte[] bytesResult = await HashingHelper.ComputeHashAsync(SHA512.Create(), stream, new Progress<HashingProgress>((_) => { }), CancellationToken.None);-- string result = FormatResult(BitConverter.ToString(bytesResult));-- result.Should().Be("417E836E280AEF701556B6135CA4B690819F82B4CF82EAD3B493B5BBC41174B9A868A68F13C90FA1A9DCDCA72BFB6268ABC061C702450BD1F838F59E33E9686D");- }-- private static string FormatResult(string input) => input.Replace("-", string.Empty);-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Helpers/HtmlHelperTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Helpers/HtmlHelperTests.csdeleted file mode 100644index 79724d58c..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Helpers/HtmlHelperTests.cs+++ /dev/null@@ -1,35 +0,0 @@-using System.Threading;-using DevToys.Tools.Helpers;--namespace DevToys.UnitTests.Tools.Helpers;--public class HtmlHelperTests-{- [Theory]- [InlineData(null, "")]- [InlineData("<hello world>", "<hello world>")]- [InlineData("<hello>", "&lt;hello&gt;")]- internal void EncodeHtml(string input, string expectedResult)- {- HtmlHelper.EncodeHtmlData(- input,- new MockILogger(),- CancellationToken.None)- .Should()- .Be(expectedResult);- }-- [Theory]- [InlineData(null, "")]- [InlineData("<hello world>", "<hello world>")]- [InlineData("&lt;hello&gt;", "<hello>")]- internal void DecodeHtml(string input, string expectedResult)- {- HtmlHelper.DecodeHtmlData(- input,- new MockILogger(),- CancellationToken.None)- .Should()- .Be(expectedResult);- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Helpers/JsonHelperTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Helpers/JsonHelperTests.csdeleted file mode 100644index 21b50dc2e..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Helpers/JsonHelperTests.cs+++ /dev/null@@ -1,190 +0,0 @@-using System.Threading;-using System.Threading.Tasks;-using DevToys.Tools.Helpers;-using DevToys.Tools.Models;--namespace DevToys.UnitTests.Tools.Helpers;--public class JsonHelperTests-{- [Theory]- [InlineData(null, true)]- [InlineData("\"foo\"", true)]- [InlineData("123", false)]- [InlineData("", false)]- [InlineData(" ", false)]- [InlineData(" { } ", true)]- [InlineData(" [ ] ", true)]- [InlineData(" { \"foo\": 123 } ", true)]- [InlineData(" bar { \"foo\": 123 } ", false)]- public async Task IsValid(string input, bool expectedResult)- {- (await JsonHelper.IsValidAsync(input, new MockILogger(), CancellationToken.None))- .Should().Be(expectedResult);- }-- [Theory]- [InlineData(null, false, "")]- [InlineData("", false, "")]- [InlineData(" ", false, "")]- [InlineData(" { } ", true, "{}")]- [InlineData(" [ ] ", true, "[]")]- [InlineData(" { \"foo\": 123 } ", true, "{\r\n \"foo\": 123\r\n}")]- public async Task FormatTwoSpaces(string input, bool expectedSucceeded, string expectedResult)- {- expectedResult = expectedResult.Replace("\r\n", Environment.NewLine);- ResultInfo<string> result = await JsonHelper.FormatAsync(input, Indentation.TwoSpaces, false, new MockILogger(), CancellationToken.None);- result.HasSucceeded.Should().Be(expectedSucceeded);- result.Data.Should().Be(expectedResult);- }-- [Theory]- [InlineData(null, false, "")]- [InlineData("", false, "")]- [InlineData(" ", false, "")]- [InlineData(" { } ", true, "{}")]- [InlineData(" [ ] ", true, "[]")]- [InlineData(" { \"foo\": 123 } ", true, "{\r\n \"foo\": 123\r\n}")]- public async Task FormatFourSpaces(string input, bool expectedSucceeded, string expectedResult)- {- expectedResult = expectedResult.Replace("\r\n", Environment.NewLine);- ResultInfo<string> result = await JsonHelper.FormatAsync(input, Indentation.FourSpaces, false, new MockILogger(), CancellationToken.None);- result.HasSucceeded.Should().Be(expectedSucceeded);- result.Data.Should().Be(expectedResult);- }-- [Theory]- [InlineData(null, false, "")]- [InlineData("", false, "")]- [InlineData(" ", false, "")]- [InlineData(" { } ", true, "{}")]- [InlineData(" [ ] ", true, "[]")]- [InlineData(" { \"foo\": 123 } ", true, "{\r\n\t\"foo\": 123\r\n}")]- public async Task FormatOneTab(string input, bool expectedSucceeded, string expectedResult)- {- expectedResult = expectedResult.Replace("\r\n", Environment.NewLine);- ResultInfo<string> result = await JsonHelper.FormatAsync(input, Indentation.OneTab, false, new MockILogger(), CancellationToken.None);- result.HasSucceeded.Should().Be(expectedSucceeded);- result.Data.Should().Be(expectedResult);- }-- [Theory]- [InlineData(null, false, "")]- [InlineData("", false, "")]- [InlineData(" ", false, "")]- [InlineData(" { } ", true, "{}")]- [InlineData(" [ ] ", true, "[]")]- [InlineData(" { \"foo\": 123 } ", true, "{\"foo\":123}")]- public async Task FormatMinifiedAsync(string input, bool expectedSucceeded, string expectedResult)- {- ResultInfo<string> result = await JsonHelper.FormatAsync(input, Indentation.Minified, false, new MockILogger(), CancellationToken.None);- result.HasSucceeded.Should().Be(expectedSucceeded);- result.Data.Should().Be(expectedResult);- }-- [Theory]- [InlineData("{ \"Date\": \"2012-04-21T18:25:43-05:00\" }", "{\"Date\":\"2012-04-21T18:25:43-05:00\"}")]- public async Task FormatDoesNotAlterateDateTimesAsync(string input, string expectedResult)- {- ResultInfo<string> result = await JsonHelper.FormatAsync(input, Indentation.Minified, false, new MockILogger(), CancellationToken.None);- result.Data.Should().Be(expectedResult);- }-- [Theory]- [InlineData(- "{\"a\": \"asdf\", \"c\" : 545, \"b\": 33, \"array\": [{\"a\": \"asdf\", \"c\" : 545, \"b\": 33, \"array\": []}]}",- "{\"a\":\"asdf\",\"array\":[{\"a\":\"asdf\",\"array\":[],\"b\":33,\"c\":545}],\"b\":33,\"c\":545}")]- public async Task FormatSortPropertiesAlphabeticallyAsync(string input, string expectedResult)- {- ResultInfo<string> result = await JsonHelper.FormatAsync(input, Indentation.Minified, true, new MockILogger(), CancellationToken.None);- result.Data.Should().Be(expectedResult);- }-- [Theory]- [InlineData(null, "")]- [InlineData("", "")]- [InlineData(" ", "")]- public void ConvertFromYamlShouldReturnEmptyString(string input, string expected)- {- // prepare & act- ResultInfo<string> actual = JsonHelper.ConvertFromYaml(- input,- Indentation.FourSpaces,- new MockILogger(),- CancellationToken.None);- actual.HasSucceeded.Should().BeFalse();- actual.Data.Should().Be(expected);- }-- [Fact(DisplayName = "Convert From Yaml with unsupported Indentation")]- public void ConvertFromYamlWithUnsupportedIndentationShouldReturnEmptyString()- {- // prepare- string input = "- key: value";- string expected = string.Empty;-- // act- ResultInfo<string> actual = JsonHelper.ConvertFromYaml(- input,- Indentation.Minified,- new MockILogger(),- CancellationToken.None);- actual.HasSucceeded.Should().BeFalse();- actual.Data.Should().Be(expected);- }-- [Fact(DisplayName = "Convert From Yaml with unsupported yaml")]- public void ConvertFromYamlWithUnsupportedYamlShouldExceptionMessage()- {- // prepare- string input = "[";- string expected = "While parsing a node, did not find expected node content.";-- // act- ResultInfo<string> actual = JsonHelper.ConvertFromYaml(- input,- Indentation.Minified,- new MockILogger(),- CancellationToken.None);- actual.HasSucceeded.Should().BeFalse();- actual.Data.Should().Be(expected);- }-- [Theory]- [InlineData(" - key: value ", "[\r\n {\r\n \"key\": \"value\"\r\n }\r\n]")]- [InlineData(" - key: value\r\n key2: 1", "[\r\n {\r\n \"key\": \"value\",\r\n \"key2\": 1\r\n }\r\n]")]- public void ConvertFromYamlWithTwoSpaces(string input, string expectedResult)- {- expectedResult = expectedResult.Replace("\r\n", Environment.NewLine);- ResultInfo<string> result = JsonHelper.ConvertFromYaml(- input,- Indentation.TwoSpaces,- new MockILogger(),- CancellationToken.None);- result.Data.Should().Be(expectedResult);- }-- [Theory]- [InlineData(" - key: value ", "[\r\n {\r\n \"key\": \"value\"\r\n }\r\n]")]- [InlineData(" - key: value\r\n key2: 1", "[\r\n {\r\n \"key\": \"value\",\r\n \"key2\": 1\r\n }\r\n]")]- public void ConvertFromYamlWithFourSpaces(string input, string expectedResult)- {- expectedResult = expectedResult.Replace("\r\n", Environment.NewLine);- ResultInfo<string> result = JsonHelper.ConvertFromYaml(- input,- Indentation.FourSpaces,- new MockILogger(),- CancellationToken.None);- result.Data.Should().Be(expectedResult);- }-- [Theory]- [InlineData(null, null, "")]- [InlineData("{\"a\": \"asdf\", \"c\" : 545, \"b\": 33, \"array\": [{\"a\": \"asdf\", \"c\" : 545, \"b\": 42, \"array\": []}]}", "array.[0].b", "[\r\n 42\r\n]")]- public async Task JsonPathTests(string json, string jsonPath, string expectedResult)- {- expectedResult = expectedResult.Replace("\r\n", Environment.NewLine);- (await JsonHelper.TestJsonPathAsync(json, jsonPath, new MockILogger(), CancellationToken.None))- .Data.Should().Be(expectedResult);- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Helpers/JsonTableHelperTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Helpers/JsonTableHelperTests.csdeleted file mode 100644index f98717dba..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Helpers/JsonTableHelperTests.cs+++ /dev/null@@ -1,20 +0,0 @@-using DevToys.Tools.Helpers;-using Newtonsoft.Json;-using Newtonsoft.Json.Linq;--namespace DevToys.UnitTests.Tools.Helpers;--public class JsonTableHelperTests-{- [Theory]- [InlineData("{\"a\":{\"b\":{\"c\":1}}}", "{\"a_b_c\":1}")]- [InlineData("{\"a\":{\"b\":{\"c\":[]}}}", "{}")]- [InlineData("{\"a\":{\"b\":1,\"c\":{\"d\":2},\"e\":[3,4]},\"f\":[5,6]}", "{\"a_b\":1,\"a_c_d\":2}")]- public void Flatten(string inputJson, string expectedJson)- {- var obj = JsonConvert.DeserializeObject(inputJson) as JObject;- JObject flattened = JsonTableHelper.FlattenJsonObject(obj);- string serialized = JsonConvert.SerializeObject(flattened);- serialized.Should().Be(expectedJson);- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Helpers/JsonWebTokenDecoderHelperTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Helpers/JsonWebTokenDecoderHelperTests.csdeleted file mode 100644index 594a56925..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Helpers/JsonWebTokenDecoderHelperTests.cs+++ /dev/null@@ -1,666 +0,0 @@-using System.Threading;-using System.Threading.Tasks;-using DevToys.Tools.Helpers;-using DevToys.Tools.Helpers.JsonWebToken;-using DevToys.Tools.Models;-using Microsoft.Extensions.Logging;--namespace DevToys.UnitTests.Tools.Helpers;--public class JsonWebTokenDecoderHelperTests-{- private readonly ILogger _logger;- private const string ToolName = "JsonWebTokenEncoderDecoder";- private const string BaseAssembly = "DevToys.UnitTests.Tools.TestData";-- public JsonWebTokenDecoderHelperTests()- {- _logger = new MockILogger();- }-- [Fact(DisplayName = "Decode Json Web Token with Invalid parameters should throw argument exception")]- public async Task DecodeTokenWithInvalidParametersShouldThrowArgumentException()- {- Func<Task> result = () => JsonWebTokenDecoderHelper.DecodeTokenAsync(null, null, _logger, CancellationToken.None).AsTask();-- await result.Should().ThrowAsync<ArgumentNullException>();- }-- [Fact(DisplayName = "Decode Json Web Token with Invalid Token should return false")]- public async Task DecodeTokenWithInvalidTokenShouldReturnError()- {- var decodeParameters = new DecoderParameters();- var tokenParameters = new TokenParameters- {- Token = "eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ"- };-- ResultInfo<JsonWebTokenResult, ResultInfoSeverity> result = await JsonWebTokenDecoderHelper.DecodeTokenAsync(- decodeParameters,- tokenParameters,- new MockILogger(), CancellationToken.None);- result.Severity.Should().Be(ResultInfoSeverity.Error);- }-- [Fact(DisplayName = "Decode Json Web Token with Invalid Public Key should return false")]- public async Task DecodeTokenWithInvalidPublicKeyShouldReturnError()- {- string tokenContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.HS.HS256-BasicToken.txt");-- var decodeParameters = new DecoderParameters()- {- ValidateSignature = true,- ValidateIssuersSigningKey = true,- };- var tokenParameters = new TokenParameters- {- Token = tokenContent,- TokenAlgorithm = JsonWebTokenAlgorithm.RS256- };-- ResultInfo<JsonWebTokenResult, ResultInfoSeverity> result = await JsonWebTokenDecoderHelper.DecodeTokenAsync(- decodeParameters,- tokenParameters,- new MockILogger(), CancellationToken.None);- result.Severity.Should().Be(ResultInfoSeverity.Error);- }-- [Fact(DisplayName = "Decode Json Web Token with Invalid Signature should return false")]- public async Task DecodeTokenWithInvalidSignatureShouldReturnError()- {- string tokenContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.HS.HS256-BasicToken.txt");-- var decodeParameters = new DecoderParameters()- {- ValidateSignature = true,- ValidateIssuersSigningKey = true,- };- var tokenParameters = new TokenParameters- {- Token = tokenContent,- };-- ResultInfo<JsonWebTokenResult, ResultInfoSeverity> result = await JsonWebTokenDecoderHelper.DecodeTokenAsync(- decodeParameters,- tokenParameters,- new MockILogger(), CancellationToken.None);- result.Severity.Should().Be(ResultInfoSeverity.Error);- }-- [Fact(DisplayName = "Decode Json Web Token with Invalid Issuers should return false")]- public async Task DecodeTokenWithInvalidIssuersShouldReturnError()- {- string tokenContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.HS.HS256-BasicToken.txt");- string signatureContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.HS.HS256-Signature.txt");-- var decodeParameters = new DecoderParameters()- {- ValidateSignature = true,- ValidateIssuers = true- };- var tokenParameters = new TokenParameters- {- Token = tokenContent,- Signature = signatureContent- };-- ResultInfo<JsonWebTokenResult, ResultInfoSeverity> result = await JsonWebTokenDecoderHelper.DecodeTokenAsync(- decodeParameters,- tokenParameters,- new MockILogger(), CancellationToken.None);- result.Severity.Should().Be(ResultInfoSeverity.Error);- }-- [Fact(DisplayName = "Decode Json Web Token with Invalid Audiences should return false")]- public async Task DecodeTokenWithInvalidAudiencesShouldReturnError()- {- string tokenContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.HS.HS256-BasicToken.txt");- string signatureContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.HS.HS256-Signature.txt");-- var decodeParameters = new DecoderParameters()- {- ValidateSignature = true,- ValidateAudiences = true- };- var tokenParameters = new TokenParameters- {- Token = tokenContent,- Signature = signatureContent- };-- ResultInfo<JsonWebTokenResult, ResultInfoSeverity> result = await JsonWebTokenDecoderHelper.DecodeTokenAsync(- decodeParameters,- tokenParameters,- new MockILogger(), CancellationToken.None);- result.Severity.Should().Be(ResultInfoSeverity.Error);- }-- [Fact(DisplayName = "Decode Json Web Token with Invalid Expired Lifetime should return false")]- public async Task DecodeTokenWithInvalidExpiredLifetimeShouldReturnError()- {- string tokenContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.HS.HS256-BasicToken.txt");- string signatureContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.HS.HS256-Signature.txt");-- var decodeParameters = new DecoderParameters()- {- ValidateSignature = true,- ValidateLifetime = true- };- var tokenParameters = new TokenParameters- {- Token = tokenContent,- Signature = signatureContent- };-- ResultInfo<JsonWebTokenResult, ResultInfoSeverity> result = await JsonWebTokenDecoderHelper.DecodeTokenAsync(- decodeParameters,- tokenParameters,- new MockILogger(), CancellationToken.None);- result.Severity.Should().Be(ResultInfoSeverity.Error);- }-- // TODO add other HS tests-- #region HS-- [Fact(DisplayName = "Decode HS256 Json Web Token with Valid Token and valid parameters should return decoded token")]- public async Task DecodeHS256TokenWithValidTokenAndValidParametersShouldReturnDecodedToken()- {- string headerContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.HS.HS256-Header.json");- string payloadContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ComplexPayload.json");-- string tokenContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.HS.HS256-ComplexToken.txt");- string signatureContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.HS.HS256-Signature.txt");- var decodeParameters = new DecoderParameters()- {- ValidateSignature = true,- ValidateIssuersSigningKey = true,- ValidateIssuers = true,- ValidateAudiences = true- };- var tokenParameters = new TokenParameters- {- Token = tokenContent,- TokenAlgorithm = JsonWebTokenAlgorithm.HS256,- Signature = signatureContent,- Issuers = ["devtoys"],- Audiences = ["devtoys"]- };-- ResultInfo<JsonWebTokenResult, ResultInfoSeverity> result = await JsonWebTokenDecoderHelper.DecodeTokenAsync(- decodeParameters,- tokenParameters,- new MockILogger(), CancellationToken.None);- result.Severity.Should().Be(ResultInfoSeverity.Success);- result.Data.Should().NotBeNull();- JsonWebTokenResult tokenResult = result.Data;- tokenResult.Header.Should().NotBeNull();- tokenResult.Payload.Should().NotBeNull();- tokenResult.Signature.Should().NotBeNull();-- ResultInfo<string> formattedHeader = await GetFormattedDataAsync(headerContent);- ResultInfo<string> formattedPayload = await GetFormattedDataAsync(payloadContent);-- tokenResult.Header.Should().Be(formattedHeader.Data);- tokenResult.Payload.Should().Be(formattedPayload.Data);- }-- #endregion-- #region RS-- [Fact(DisplayName = "Decode RS256 Public Key Json Web Token with Valid Token and valid parameters should return decoded token")]- public async Task DecodeRS256PublicKeyTokenWithValidTokenAndValidParametersShouldReturnDecodedToken()- {- string headerContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.RS.RS256-Header.json");- string payloadContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ComplexPayload.json");-- string tokenContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.RS.RS256-ComplexToken.txt");- string publicKeyContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.RS.RS256-PublicKey.txt");-- var decodeParameters = new DecoderParameters()- {- ValidateSignature = true,- ValidateIssuersSigningKey = true,- ValidateIssuers = true,- ValidateAudiences = true- };- var tokenParameters = new TokenParameters- {- Token = tokenContent,- TokenAlgorithm = JsonWebTokenAlgorithm.RS256,- PublicKey = publicKeyContent,- Issuers = ["devtoys"],- Audiences = ["devtoys"]- };-- ResultInfo<JsonWebTokenResult, ResultInfoSeverity> result = await JsonWebTokenDecoderHelper.DecodeTokenAsync(- decodeParameters,- tokenParameters,- new MockILogger(), CancellationToken.None);- result.Severity.Should().Be(ResultInfoSeverity.Success);- result.Data.Should().NotBeNull();- JsonWebTokenResult tokenResult = result.Data;- tokenResult.Header.Should().NotBeNull();- tokenResult.Payload.Should().NotBeNull();-- ResultInfo<string> formattedHeader = await GetFormattedDataAsync(headerContent);- ResultInfo<string> formattedPayload = await GetFormattedDataAsync(payloadContent);-- tokenResult.Header.Should().Be(formattedHeader.Data);- tokenResult.Payload.Should().Be(formattedPayload.Data);- }-- [Fact(DisplayName = "Decode RS384 Public Key Json Web Token with Valid Token and valid parameters should return decoded token")]- public async Task DecodeRS384PublicKeyTokenWithValidTokenAndValidParametersShouldReturnDecodedToken()- {- string headerContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.RS.RS384-Header.json");- string payloadContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ComplexPayload.json");-- string tokenContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.RS.RS384-ComplexToken.txt");- string publicKeyContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.RS.RS384-PublicKey.txt");-- var decodeParameters = new DecoderParameters()- {- ValidateSignature = true,- ValidateIssuersSigningKey = true,- ValidateIssuers = true,- ValidateAudiences = true- };- var tokenParameters = new TokenParameters- {- Token = tokenContent,- TokenAlgorithm = JsonWebTokenAlgorithm.RS384,- PublicKey = publicKeyContent,- Issuers = ["devtoys"],- Audiences = ["devtoys"]- };-- ResultInfo<JsonWebTokenResult, ResultInfoSeverity> result = await JsonWebTokenDecoderHelper.DecodeTokenAsync(- decodeParameters,- tokenParameters,- new MockILogger(), CancellationToken.None);- result.Severity.Should().Be(ResultInfoSeverity.Success);- result.Data.Should().NotBeNull();- JsonWebTokenResult tokenResult = result.Data;- tokenResult.Header.Should().NotBeNull();- tokenResult.Payload.Should().NotBeNull();-- ResultInfo<string> formattedHeader = await GetFormattedDataAsync(headerContent);- ResultInfo<string> formattedPayload = await GetFormattedDataAsync(payloadContent);-- tokenResult.Header.Should().Be(formattedHeader.Data);- tokenResult.Payload.Should().Be(formattedPayload.Data);- }-- [Fact(DisplayName = "Decode RS512 Public Key Json Web Token with Valid Token and valid parameters should return decoded token")]- public async Task DecodeRS512PublicKeyTokenWithValidTokenAndValidParametersShouldReturnDecodedToken()- {- string headerContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.RS.RS512-Header.json");- string payloadContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ComplexPayload.json");-- string tokenContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.RS.RS512-ComplexToken.txt");- string publicKeyContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.RS.RS512-PublicKey.txt");- var decodeParameters = new DecoderParameters()- {- ValidateSignature = true,- ValidateIssuersSigningKey = true,- ValidateIssuers = true,- ValidateAudiences = true- };- var tokenParameters = new TokenParameters- {- Token = tokenContent,- TokenAlgorithm = JsonWebTokenAlgorithm.RS512,- PublicKey = publicKeyContent,- Issuers = ["devtoys"],- Audiences = ["devtoys"]- };-- ResultInfo<JsonWebTokenResult, ResultInfoSeverity> result = await JsonWebTokenDecoderHelper.DecodeTokenAsync(- decodeParameters,- tokenParameters,- new MockILogger(), CancellationToken.None);- result.Severity.Should().Be(ResultInfoSeverity.Success);- result.Data.Should().NotBeNull();- JsonWebTokenResult tokenResult = result.Data;- tokenResult.Header.Should().NotBeNull();- tokenResult.Payload.Should().NotBeNull();-- ResultInfo<string> formattedHeader = await GetFormattedDataAsync(headerContent);- ResultInfo<string> formattedPayload = await GetFormattedDataAsync(payloadContent);-- tokenResult.Header.Should().Be(formattedHeader.Data);- tokenResult.Payload.Should().Be(formattedPayload.Data);- }-- #endregion-- #region PS-- [Fact(DisplayName = "Decode PS256 Public Key Json Web Token with Valid Token and valid parameters should return decoded token")]- public async Task DecodePS256PublicKeyTokenWithValidTokenAndValidParametersShouldReturnDecodedToken()- {- string headerContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.PS.PS256-Header.json");- string payloadContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ComplexPayload.json");-- string tokenContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.PS.PS256-ComplexToken.txt");- string publicKeyContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.PS.PS256-PublicKey.txt");- var decodeParameters = new DecoderParameters()- {- ValidateSignature = true,- ValidateIssuersSigningKey = true,- ValidateIssuers = true,- ValidateAudiences = true- };- var tokenParameters = new TokenParameters- {- Token = tokenContent,- TokenAlgorithm = JsonWebTokenAlgorithm.PS256,- PublicKey = publicKeyContent,- Issuers = ["devtoys"],- Audiences = ["devtoys"]- };-- ResultInfo<JsonWebTokenResult, ResultInfoSeverity> result = await JsonWebTokenDecoderHelper.DecodeTokenAsync(- decodeParameters,- tokenParameters,- new MockILogger(), CancellationToken.None);- result.Severity.Should().Be(ResultInfoSeverity.Success);- result.Data.Should().NotBeNull();- JsonWebTokenResult tokenResult = result.Data;- tokenResult.Header.Should().NotBeNull();- tokenResult.Payload.Should().NotBeNull();-- ResultInfo<string> formattedHeader = await GetFormattedDataAsync(headerContent);- ResultInfo<string> formattedPayload = await GetFormattedDataAsync(payloadContent);-- tokenResult.Header.Should().Be(formattedHeader.Data);- tokenResult.Payload.Should().Be(formattedPayload.Data);- }-- [Fact(DisplayName = "Decode PS384 Public Key Json Web Token with Valid Token and valid parameters should return decoded token")]- public async Task DecodePS384PublicKeyTokenWithValidTokenAndValidParametersShouldReturnDecodedToken()- {- string headerContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.PS.PS384-Header.json");- string payloadContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ComplexPayload.json");-- string tokenContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.PS.PS384-ComplexToken.txt");- string publicKeyContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.PS.PS384-PublicKey.txt");- var decodeParameters = new DecoderParameters()- {- ValidateSignature = true,- ValidateIssuersSigningKey = true,- ValidateIssuers = true,- ValidateAudiences = true- };- var tokenParameters = new TokenParameters- {- Token = tokenContent,- TokenAlgorithm = JsonWebTokenAlgorithm.PS384,- PublicKey = publicKeyContent,- Issuers = ["devtoys"],- Audiences = ["devtoys"]- };-- ResultInfo<JsonWebTokenResult, ResultInfoSeverity> result = await JsonWebTokenDecoderHelper.DecodeTokenAsync(- decodeParameters,- tokenParameters,- new MockILogger(), CancellationToken.None);- result.Severity.Should().Be(ResultInfoSeverity.Success);- result.Data.Should().NotBeNull();- JsonWebTokenResult tokenResult = result.Data;- tokenResult.Header.Should().NotBeNull();- tokenResult.Payload.Should().NotBeNull();-- ResultInfo<string> formattedHeader = await GetFormattedDataAsync(headerContent);- ResultInfo<string> formattedPayload = await GetFormattedDataAsync(payloadContent);-- tokenResult.Header.Should().Be(formattedHeader.Data);- tokenResult.Payload.Should().Be(formattedPayload.Data);- }-- [Fact(DisplayName = "Decode PS512 Public Key Json Web Token with Valid Token and valid parameters should return decoded token")]- public async Task DecodePS512PublicKeyTokenWithValidTokenAndValidParametersShouldReturnDecodedToken()- {- string headerContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.PS.PS512-Header.json");- string payloadContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ComplexPayload.json");-- string tokenContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.PS.PS512-ComplexToken.txt");- string publicKeyContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.PS.PS512-PublicKey.txt");- var decodeParameters = new DecoderParameters()- {- ValidateSignature = true,- ValidateIssuersSigningKey = true,- ValidateIssuers = true,- ValidateAudiences = true- };- var tokenParameters = new TokenParameters- {- Token = tokenContent,- TokenAlgorithm = JsonWebTokenAlgorithm.PS512,- PublicKey = publicKeyContent,- Issuers = ["devtoys"],- Audiences = ["devtoys"]- };-- ResultInfo<JsonWebTokenResult, ResultInfoSeverity> result = await JsonWebTokenDecoderHelper.DecodeTokenAsync(- decodeParameters,- tokenParameters,- new MockILogger(), CancellationToken.None);- result.Severity.Should().Be(ResultInfoSeverity.Success);- result.Data.Should().NotBeNull();- JsonWebTokenResult tokenResult = result.Data;- tokenResult.Header.Should().NotBeNull();- tokenResult.Payload.Should().NotBeNull();-- ResultInfo<string> formattedHeader = await GetFormattedDataAsync(headerContent);- ResultInfo<string> formattedPayload = await GetFormattedDataAsync(payloadContent);-- tokenResult.Header.Should().Be(formattedHeader.Data);- tokenResult.Payload.Should().Be(formattedPayload.Data);- }-- #endregion-- #region ES-- [Fact(DisplayName = "Decode ES256 Public Key Json Web Token with Valid Token and valid parameters should return decoded token")]- public async Task DecodeES256PublicKeyTokenWithValidTokenAndValidParametersShouldReturnDecodedToken()- {- string headerContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ES.ES256-Header.json");- string payloadContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ComplexPayload.json");-- string tokenContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ES.ES256-ComplexToken.txt");- string publicKeyContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ES.ES256-PublicKey.txt");-- var decodeParameters = new DecoderParameters()- {- ValidateSignature = true,- ValidateIssuersSigningKey = true,- ValidateIssuers = true,- ValidateAudiences = true- };- var tokenParameters = new TokenParameters- {- Token = tokenContent,- TokenAlgorithm = JsonWebTokenAlgorithm.ES256,- PublicKey = publicKeyContent,- Issuers = ["devtoys"],- Audiences = ["devtoys"]- };-- ResultInfo<JsonWebTokenResult, ResultInfoSeverity> result = await JsonWebTokenDecoderHelper.DecodeTokenAsync(- decodeParameters,- tokenParameters,- new MockILogger(), CancellationToken.None);- result.Severity.Should().Be(ResultInfoSeverity.Success);- result.Data.Should().NotBeNull();- JsonWebTokenResult tokenResult = result.Data;- tokenResult.Header.Should().NotBeNull();- tokenResult.Payload.Should().NotBeNull();-- ResultInfo<string> formattedHeader = await GetFormattedDataAsync(headerContent);- ResultInfo<string> formattedPayload = await GetFormattedDataAsync(payloadContent);-- tokenResult.Header.Should().Be(formattedHeader.Data);- tokenResult.Payload.Should().Be(formattedPayload.Data);- }-- [Fact(DisplayName = "Decode ES384 Public Key Json Web Token with Valid Token and valid parameters should return decoded token")]- public async Task DecodeES384PublicKeyTokenWithValidTokenAndValidParametersShouldReturnDecodedToken()- {- string headerContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ES.ES384-Header.json");- string payloadContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ComplexPayload.json");-- string tokenContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ES.ES384-ComplexToken.txt");- string publicKeyContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ES.ES384-PublicKey.txt");-- var decodeParameters = new DecoderParameters()- {- ValidateSignature = true,- ValidateIssuersSigningKey = true,- ValidateIssuers = true,- ValidateAudiences = true- };- var tokenParameters = new TokenParameters- {- Token = tokenContent,- TokenAlgorithm = JsonWebTokenAlgorithm.ES384,- PublicKey = publicKeyContent,- Issuers = ["devtoys"],- Audiences = ["devtoys"]- };-- ResultInfo<JsonWebTokenResult, ResultInfoSeverity> result = await JsonWebTokenDecoderHelper.DecodeTokenAsync(- decodeParameters,- tokenParameters,- new MockILogger(), CancellationToken.None);- result.Severity.Should().Be(ResultInfoSeverity.Success);- result.Data.Should().NotBeNull();- JsonWebTokenResult tokenResult = result.Data;- tokenResult.Header.Should().NotBeNull();- tokenResult.Payload.Should().NotBeNull();-- ResultInfo<string> formattedHeader = await GetFormattedDataAsync(headerContent);- ResultInfo<string> formattedPayload = await GetFormattedDataAsync(payloadContent);-- tokenResult.Header.Should().Be(formattedHeader.Data);- tokenResult.Payload.Should().Be(formattedPayload.Data);- }-- [Fact(DisplayName = "Decode ES512 Public Key Json Web Token with Valid Token and valid parameters should return decoded token")]- public async Task DecodeES512PublicKeyTokenWithValidTokenAndValidParametersShouldReturnDecodedToken()- {- string headerContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ES.ES512-Header.json");- string payloadContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ComplexPayload.json");-- string tokenContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ES.ES512-ComplexToken.txt");- string publicKeyContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ES.ES512-PublicKey.txt");- var decodeParameters = new DecoderParameters()- {- ValidateSignature = true,- ValidateIssuersSigningKey = true,- ValidateIssuers = true,- ValidateAudiences = true- };- var tokenParameters = new TokenParameters- {- Token = tokenContent,- TokenAlgorithm = JsonWebTokenAlgorithm.ES512,- PublicKey = publicKeyContent,- Issuers = ["devtoys"],- Audiences = ["devtoys"]- };-- ResultInfo<JsonWebTokenResult, ResultInfoSeverity> result = await JsonWebTokenDecoderHelper.DecodeTokenAsync(- decodeParameters,- tokenParameters,- new MockILogger(), CancellationToken.None);- result.Severity.Should().Be(ResultInfoSeverity.Success);- result.Data.Should().NotBeNull();- JsonWebTokenResult tokenResult = result.Data;- tokenResult.Header.Should().NotBeNull();- tokenResult.Payload.Should().NotBeNull();-- ResultInfo<string> formattedHeader = await GetFormattedDataAsync(headerContent);- ResultInfo<string> formattedPayload = await GetFormattedDataAsync(payloadContent);-- tokenResult.Header.Should().Be(formattedHeader.Data);- tokenResult.Payload.Should().Be(formattedPayload.Data);- }-- #endregion-- #region GetTokenAlgorithm-- [Fact(DisplayName = "Get Json Web Token Algorithm with invalid parameters should throw argument exception")]- public void GetTokenAlgorithmWithInvalidParametersShouldThrowArgumentException()- {- Func<ResultInfo<JsonWebTokenAlgorithm?>> result = () => JsonWebTokenDecoderHelper.GetTokenAlgorithm(null, _logger);- result.Should().Throw<ArgumentException>();- }-- [Fact(DisplayName = "Get Json Web Token Algorithm with invalid token should return error")]- public void GetTokenAlgorithmWithInvalidTokenShouldReturnError()- {- string tokenContent = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwib2JqZWN0Ijp7Ik9iamVjdF";-- ResultInfo<JsonWebTokenAlgorithm?> result = JsonWebTokenDecoderHelper.GetTokenAlgorithm(tokenContent, _logger);- result.HasSucceeded.Should().BeFalse();- }-- [Fact(DisplayName = "Get Json Web Token Algorithm with HS256 token should return HS256")]- public async Task GetTokenAlgorithmWithInvalidTokenShouldJwtAlgorithmHS256()- {- string tokenContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.HS.HS256-BasicToken.txt");-- ResultInfo<JsonWebTokenAlgorithm?> result = JsonWebTokenDecoderHelper.GetTokenAlgorithm(tokenContent, _logger);- result.HasSucceeded.Should().BeTrue();- result.Data.Should().NotBeNull();- result.Data.Should().Be(JsonWebTokenAlgorithm.HS256);- }-- [Fact(DisplayName = "Get Json Web Token Algorithm with PS384 token should return PS384")]- public async Task GetTokenAlgorithmWithInvalidTokenShouldJwtAlgorithmPS384()- {- string tokenContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.PS.PS384-ComplexToken.txt");-- ResultInfo<JsonWebTokenAlgorithm?> result = JsonWebTokenDecoderHelper.GetTokenAlgorithm(tokenContent, _logger);- result.HasSucceeded.Should().BeTrue();- result.Data.Should().NotBeNull();- result.Data.Should().Be(JsonWebTokenAlgorithm.PS384);- }-- [Fact(DisplayName = "Get Json Web Token Algorithm with RS512 token should return RS512")]- public async Task GetTokenAlgorithmWithInvalidTokenShouldJwtAlgorithmRS512()- {- string tokenContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.RS.RS512-ComplexToken.txt");-- ResultInfo<JsonWebTokenAlgorithm?> result = JsonWebTokenDecoderHelper.GetTokenAlgorithm(tokenContent, _logger);- result.HasSucceeded.Should().BeTrue();- result.Data.Should().NotBeNull();- result.Data.Should().Be(JsonWebTokenAlgorithm.RS512);- }-- [Fact(DisplayName = "Get Json Web Token Algorithm with ES256 token should return ES256")]- public async Task GetTokenAlgorithmWithInvalidTokenShouldJwtAlgorithmES256()- {- string tokenContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ES.ES256-ComplexToken.txt");-- ResultInfo<JsonWebTokenAlgorithm?> result = JsonWebTokenDecoderHelper.GetTokenAlgorithm(tokenContent, _logger);- result.HasSucceeded.Should().BeTrue();- result.Data.Should().NotBeNull();- result.Data.Should().Be(JsonWebTokenAlgorithm.ES256);- }-- #endregion-- private async Task<ResultInfo<string>> GetFormattedDataAsync(string rawData)- => await JsonHelper.FormatAsync(- rawData,- Indentation.TwoSpaces,- false,- _logger,- CancellationToken.None);-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Helpers/JsonWebTokenEncoderHelperTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Helpers/JsonWebTokenEncoderHelperTests.csdeleted file mode 100644index 4e66ba420..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Helpers/JsonWebTokenEncoderHelperTests.cs+++ /dev/null@@ -1,446 +0,0 @@-using System.Threading;-using System.Threading.Tasks;-using DevToys.Tools.Helpers;-using DevToys.Tools.Helpers.JsonWebToken;-using DevToys.Tools.Models;-using DevToys.Tools.Tools.EncodersDecoders.JsonWebToken;-using Microsoft.Extensions.Logging;--namespace DevToys.UnitTests.Tools.Helpers;--public class JsonWebTokenEncoderHelperTests-{- private readonly ILogger _logger;- private const string ToolName = "JsonWebTokenEncoderDecoder";- private const string BaseAssembly = "DevToys.UnitTests.Tools.TestData";-- public JsonWebTokenEncoderHelperTests()- {- _logger = new MockILogger();- }-- [Fact(DisplayName = "Encode Json Web Token with invalid parameters should throw argument exception")]- public void GenerateTokenWithInvalidParametersShouldThrowArgumentException()- {- Action result = () => JsonWebTokenEncoderHelper.GenerateToken(null, null, _logger);-- result.Should().Throw<ArgumentNullException>();- }-- [Fact(DisplayName = "Encode Json Web Token with Invalid Payload should return false")]- public void GenerateTokenWithInvalidPayloadShouldReturnError()- {- var encoderParameters = new EncoderParameters();- var tokenParameters = new TokenParameters- {- Payload = "xxx"- };-- ResultInfo<JsonWebTokenResult, ResultInfoSeverity> result = JsonWebTokenEncoderHelper.GenerateToken(- encoderParameters,- tokenParameters,- new MockILogger());- result.Severity.Should().Be(ResultInfoSeverity.Error);- }-- [Fact(DisplayName = "Encode Json Web Token with Invalid Signature should return false")]- public async Task GenerateTokenWithInvalidSignatureShouldReturnError()- {- string payloadContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.BasicPayload.json");-- var encoderParameters = new EncoderParameters();- var tokenParameters = new TokenParameters- {- Payload = payloadContent,- TokenAlgorithm = JsonWebTokenAlgorithm.HS256- };-- ResultInfo<JsonWebTokenResult, ResultInfoSeverity> result = JsonWebTokenEncoderHelper.GenerateToken(- encoderParameters,- tokenParameters,- new MockILogger());- result.Severity.Should().Be(ResultInfoSeverity.Error);- result.ErrorMessage.Should().Be(JsonWebTokenEncoderDecoder.InvalidSignature);- }-- [Fact(DisplayName = "Encode Json Web Token with Invalid Issuers should return false")]- public async Task GenerateTokenWithInvalidIssuersShouldReturnError()- {- string payloadContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.BasicPayload.json");- string signatureContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.HS.HS256-Signature.txt");-- var encoderParameters = new EncoderParameters()- {- HasIssuer = true- };- var tokenParameters = new TokenParameters- {- Payload = payloadContent,- Signature = signatureContent,- TokenAlgorithm = JsonWebTokenAlgorithm.HS256- };-- ResultInfo<JsonWebTokenResult, ResultInfoSeverity> result = JsonWebTokenEncoderHelper.GenerateToken(- encoderParameters,- tokenParameters,- new MockILogger());- result.Severity.Should().Be(ResultInfoSeverity.Error);- result.ErrorMessage.Should().Be(JsonWebTokenEncoderDecoder.ValidIssuersEmptyError);- }-- [Fact(DisplayName = "Encode Json Web Token with Invalid Audience should return false")]- public async Task GenerateTokenWithInvalidAudiencesShouldReturnError()- {- string payloadContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.BasicPayload.json");- string signatureContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.HS.HS256-Signature.txt");-- var encoderParameters = new EncoderParameters()- {- HasAudience = true- };- var tokenParameters = new TokenParameters- {- Payload = payloadContent,- Signature = signatureContent,- TokenAlgorithm = JsonWebTokenAlgorithm.HS256- };-- ResultInfo<JsonWebTokenResult, ResultInfoSeverity> result = JsonWebTokenEncoderHelper.GenerateToken(- encoderParameters,- tokenParameters,- new MockILogger());- result.Severity.Should().Be(ResultInfoSeverity.Error);- result.ErrorMessage.Should().Be(JsonWebTokenEncoderDecoder.ValidAudiencesEmptyError);- }-- [Fact(DisplayName = "Encode Json Web Token with Invalid Expiration should return false")]- public async Task GenerateTokenWithInvalidExpirationShouldReturnError()- {- string payloadContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.BasicPayload.json");- string signatureContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.HS.HS256-Signature.txt");-- var encoderParameters = new EncoderParameters()- {- HasExpiration = true- };- var tokenParameters = new TokenParameters- {- Payload = payloadContent,- Signature = signatureContent,- TokenAlgorithm = JsonWebTokenAlgorithm.HS256- };-- ResultInfo<JsonWebTokenResult, ResultInfoSeverity> result = JsonWebTokenEncoderHelper.GenerateToken(- encoderParameters,- tokenParameters,- new MockILogger());- result.Severity.Should().Be(ResultInfoSeverity.Error);- result.ErrorMessage.Should().Be(JsonWebTokenEncoderDecoder.InvalidExpiration);- }-- #region HS-- [Fact(DisplayName = "Encode HS256 Json Web Token with Valid Payload and Valid Parameters should return token")]- public async Task DecodeHS256TokenWithValidTokenAndValidParametersShouldReturnError()- {- string payloadContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ComplexPayload.json");- string signatureContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.HS.HS256-Signature.txt");-- var encoderParameters = new EncoderParameters()- {- HasIssuer = true,- HasAudience = true- };- var tokenParameters = new TokenParameters- {- Payload = payloadContent,- Signature = signatureContent,- TokenAlgorithm = JsonWebTokenAlgorithm.HS256,- Issuers = ["DevToys"],- Audiences = ["DevToys"]- };-- ResultInfo<JsonWebTokenResult, ResultInfoSeverity> result = JsonWebTokenEncoderHelper.GenerateToken(- encoderParameters,- tokenParameters,- new MockILogger());- result.Severity.Should().Be(ResultInfoSeverity.Success);- result.Data.Should().NotBeNull();- result.Data.Token.Should().NotBeNullOrWhiteSpace();- }-- #endregion-- #region RS-- [Fact(DisplayName = "Encode RS256 Json Web Token with Valid Payload and Valid Parameters should return token")]- public async Task DecodeRS256TokenWithValidTokenAndValidParametersShouldReturnError()- {- string payloadContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ComplexPayload.json");- string privateKeyContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.RS.RS256-RsaPrivateKey.txt");-- var encoderParameters = new EncoderParameters()- {- HasIssuer = true,- HasAudience = true- };- var tokenParameters = new TokenParameters- {- Payload = payloadContent,- PrivateKey = privateKeyContent,- TokenAlgorithm = JsonWebTokenAlgorithm.RS256,- Issuers = ["DevToys"],- Audiences = ["DevToys"]- };-- ResultInfo<JsonWebTokenResult, ResultInfoSeverity> result = JsonWebTokenEncoderHelper.GenerateToken(- encoderParameters,- tokenParameters,- new MockILogger());- result.Severity.Should().Be(ResultInfoSeverity.Success);- result.Data.Should().NotBeNull();- result.Data.Token.Should().NotBeNullOrWhiteSpace();- }-- [Fact(DisplayName = "Encode RS384 Json Web Token with Valid Payload and Valid Parameters should return token")]- public async Task DecodeRS384TokenWithValidTokenAndValidParametersShouldReturnError()- {- string payloadContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ComplexPayload.json");- string privateKeyContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.RS.RS384-PrivateKey.txt");-- var encoderParameters = new EncoderParameters()- {- HasIssuer = true,- HasAudience = true- };- var tokenParameters = new TokenParameters- {- Payload = payloadContent,- PrivateKey = privateKeyContent,- TokenAlgorithm = JsonWebTokenAlgorithm.RS384,- Issuers = ["DevToys"],- Audiences = ["DevToys"]- };-- ResultInfo<JsonWebTokenResult, ResultInfoSeverity> result = JsonWebTokenEncoderHelper.GenerateToken(- encoderParameters,- tokenParameters,- new MockILogger());- result.Severity.Should().Be(ResultInfoSeverity.Success);- result.Data.Should().NotBeNull();- result.Data.Token.Should().NotBeNullOrWhiteSpace();- }-- [Fact(DisplayName = "Encode RS512 Json Web Token with Valid Payload and Valid Parameters should return token")]- public async Task DecodeRS512TokenWithValidTokenAndValidParametersShouldReturnError()- {- string payloadContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ComplexPayload.json");- string privateKeyContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.RS.RS512-PrivateKey.txt");-- var encoderParameters = new EncoderParameters()- {- HasIssuer = true,- HasAudience = true- };- var tokenParameters = new TokenParameters- {- Payload = payloadContent,- PrivateKey = privateKeyContent,- TokenAlgorithm = JsonWebTokenAlgorithm.RS512,- Issuers = ["DevToys"],- Audiences = ["DevToys"]- };-- ResultInfo<JsonWebTokenResult, ResultInfoSeverity> result = JsonWebTokenEncoderHelper.GenerateToken(- encoderParameters,- tokenParameters,- new MockILogger());- result.Severity.Should().Be(ResultInfoSeverity.Success);- result.Data.Should().NotBeNull();- result.Data.Token.Should().NotBeNullOrWhiteSpace();- }-- #endregion-- #region PS-- [Fact(DisplayName = "Encode PS256 Json Web Token with Valid Payload and Valid Parameters should return token")]- public async Task DecodePS256TokenWithValidTokenAndValidParametersShouldReturnError()- {- string payloadContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ComplexPayload.json");- string privateKeyContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.PS.PS256-RsaPrivateKey.txt");-- var encoderParameters = new EncoderParameters()- {- HasIssuer = true,- HasAudience = true- };- var tokenParameters = new TokenParameters- {- Payload = payloadContent,- PrivateKey = privateKeyContent,- TokenAlgorithm = JsonWebTokenAlgorithm.PS256,- Issuers = ["DevToys"],- Audiences = ["DevToys"]- };-- ResultInfo<JsonWebTokenResult, ResultInfoSeverity> result = JsonWebTokenEncoderHelper.GenerateToken(- encoderParameters,- tokenParameters,- new MockILogger());- result.Severity.Should().Be(ResultInfoSeverity.Success);- result.Data.Should().NotBeNull();- result.Data.Token.Should().NotBeNullOrWhiteSpace();- }-- [Fact(DisplayName = "Encode PS384 Json Web Token with Valid Payload and Valid Parameters should return token")]- public async Task DecodePS384TokenWithValidTokenAndValidParametersShouldReturnError()- {- string payloadContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ComplexPayload.json");- string privateKeyContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.PS.PS384-PrivateKey.txt");-- var encoderParameters = new EncoderParameters()- {- HasIssuer = true,- HasAudience = true- };- var tokenParameters = new TokenParameters- {- Payload = payloadContent,- PrivateKey = privateKeyContent,- TokenAlgorithm = JsonWebTokenAlgorithm.PS384,- Issuers = ["DevToys"],- Audiences = ["DevToys"]- };-- ResultInfo<JsonWebTokenResult, ResultInfoSeverity> result = JsonWebTokenEncoderHelper.GenerateToken(- encoderParameters,- tokenParameters,- new MockILogger());- result.Severity.Should().Be(ResultInfoSeverity.Success);- result.Data.Should().NotBeNull();- result.Data.Token.Should().NotBeNullOrWhiteSpace();- }-- [Fact(DisplayName = "Encode PS512 Json Web Token with Valid Payload and Valid Parameters should return token")]- public async Task DecodePS512TokenWithValidTokenAndValidParametersShouldReturnError()- {- string payloadContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ComplexPayload.json");- string privateKeyContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.PS.PS512-PrivateKey.txt");-- var encoderParameters = new EncoderParameters()- {- HasIssuer = true,- HasAudience = true- };- var tokenParameters = new TokenParameters- {- Payload = payloadContent,- PrivateKey = privateKeyContent,- TokenAlgorithm = JsonWebTokenAlgorithm.PS512,- Issuers = ["DevToys"],- Audiences = ["DevToys"]- };-- ResultInfo<JsonWebTokenResult, ResultInfoSeverity> result = JsonWebTokenEncoderHelper.GenerateToken(- encoderParameters,- tokenParameters,- new MockILogger());- result.Severity.Should().Be(ResultInfoSeverity.Success);- result.Data.Should().NotBeNull();- result.Data.Token.Should().NotBeNullOrWhiteSpace();- }-- #endregion-- #region ES-- [Fact(DisplayName = "Encode ES256 Json Web Token with Valid Payload and Valid Parameters should return token")]- public async Task DecodeES256TokenWithValidTokenAndValidParametersShouldReturnError()- {- string payloadContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ComplexPayload.json");- string privateKeyContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ES.ES256-PrivateKey.txt");-- var encoderParameters = new EncoderParameters()- {- HasIssuer = true,- HasAudience = true- };- var tokenParameters = new TokenParameters- {- Payload = payloadContent,- PrivateKey = privateKeyContent,- TokenAlgorithm = JsonWebTokenAlgorithm.ES256,- Issuers = ["DevToys"],- Audiences = ["DevToys"]- };-- ResultInfo<JsonWebTokenResult, ResultInfoSeverity> result = JsonWebTokenEncoderHelper.GenerateToken(- encoderParameters,- tokenParameters,- new MockILogger());- result.Severity.Should().Be(ResultInfoSeverity.Success);- result.Data.Should().NotBeNull();- result.Data.Token.Should().NotBeNullOrWhiteSpace();- }-- [Fact(DisplayName = "Encode ES384 Json Web Token with Valid Payload and Valid Parameters should return token")]- public async Task DecodeES384TokenWithValidTokenAndValidParametersShouldReturnError()- {- string payloadContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ComplexPayload.json");- string privateKeyContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ES.ES384-PrivateKey.txt");-- var encoderParameters = new EncoderParameters()- {- HasIssuer = true,- HasAudience = true- };- var tokenParameters = new TokenParameters- {- Payload = payloadContent,- PrivateKey = privateKeyContent,- TokenAlgorithm = JsonWebTokenAlgorithm.ES384,- Issuers = ["DevToys"],- Audiences = ["DevToys"]- };-- ResultInfo<JsonWebTokenResult, ResultInfoSeverity> result = JsonWebTokenEncoderHelper.GenerateToken(- encoderParameters,- tokenParameters,- new MockILogger());- result.Severity.Should().Be(ResultInfoSeverity.Success);- result.Data.Should().NotBeNull();- result.Data.Token.Should().NotBeNullOrWhiteSpace();- }-- [Fact(DisplayName = "Encode ES512 Json Web Token with Valid Payload and Valid Parameters should return token")]- public async Task DecodeES512TokenWithValidTokenAndValidParametersShouldReturnError()- {- string payloadContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ComplexPayload.json");- string privateKeyContent = await TestDataProvider.GetEmbeddedFileContent($"{BaseAssembly}.{ToolName}.ES.ES512-PrivateKey.txt");-- var encoderParameters = new EncoderParameters()- {- HasIssuer = true,- HasAudience = true- };- var tokenParameters = new TokenParameters- {- Payload = payloadContent,- PrivateKey = privateKeyContent,- TokenAlgorithm = JsonWebTokenAlgorithm.ES512,- Issuers = ["DevToys"],- Audiences = ["DevToys"]- };-- ResultInfo<JsonWebTokenResult, ResultInfoSeverity> result = JsonWebTokenEncoderHelper.GenerateToken(- encoderParameters,- tokenParameters,- new MockILogger());- result.Severity.Should().Be(ResultInfoSeverity.Success);- result.Data.Should().NotBeNull();- result.Data.Token.Should().NotBeNullOrWhiteSpace();- }-- #endregion-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Helpers/JwtHelperTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Helpers/JwtHelperTests.csdeleted file mode 100644index 048145e06..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Helpers/JwtHelperTests.cs+++ /dev/null@@ -1,21 +0,0 @@-using DevToys.Tools.Helpers.JsonWebToken;--namespace DevToys.UnitTests.Tools.Helpers;--public class JwtHelperTests-{- [Theory]- [InlineData(null, false)]- [InlineData("", false)]- [InlineData(" ", false)]- [InlineData("eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c", true)]- [InlineData("eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ", false)]- [InlineData("Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c", true)]- [InlineData("Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ", false)]- [InlineData("Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c", true)]- [InlineData("Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ", false)]- public void IsValid(string input, bool expectedResult)- {- JsonWebTokenHelper.IsValid(input, new MockILogger()).Should().Be(expectedResult);- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Helpers/LipsumTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Helpers/LipsumTests.csdeleted file mode 100644index 8b77897bd..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Helpers/LipsumTests.cs+++ /dev/null@@ -1,162 +0,0 @@-using DevToys.Tools.Helpers.LoremIpsum;--namespace DevToys.UnitTests.Tools.Helpers;--public class LipsumTests-{- [Fact]- public void LoadXml()- {- string template = "<root><text>{0}</text></root>";- string expectedText = "Lorem ipsum dolor sit amet";- string formatted = String.Format(template, expectedText);-- var lipsum = new LipsumGenerator(formatted, true);- lipsum.LipsumText.ToString().Should().Be(expectedText);- }-- [Fact]- public void LoadPlainText()- {- string expectedText = "Lorem ipsum dolor sit amet";-- var lipsum = new LipsumGenerator(expectedText, false);- lipsum.LipsumText.ToString().Should().Be(expectedText);- }-- [Fact]- public void DefaultConstructorContainsLoremIpsum()- {- string expected = Lipsums.GetText(LipsumsCorpus.LoremIpsum);- var generator = new LipsumGenerator(LipsumsCorpus.LoremIpsum);- generator.LipsumText.ToString().Should().Be(expected);- }-- [Fact]- public void PrepareWords()- {- string rawText = "lorem ipsum dolor sit amet consetetur";- string[] expectedArray = new string[] {- "lorem", "ipsum", "dolor", "sit", "amet", "consetetur"- };- int wordsInRawText = 6;-- var lipsum = new LipsumGenerator(rawText, false);- IReadOnlyList<string> wordsPrepared = lipsum.PreparedWords;-- wordsPrepared.Should().HaveCount(wordsInRawText);- wordsPrepared.Should().BeEquivalentTo(expectedArray);-- }-- [Fact]- public void GenerateWords()- {- string rawText = "lorem ipsum dolor sit amet consetetur";-- var lipsum = new LipsumGenerator(rawText, false);-- int wordCount = 4;-- string[] generatedWords = lipsum.GenerateWords(wordCount);-- generatedWords.Should().HaveCount(wordCount);-- for (int i = 0; i < wordCount; i++)- {- rawText.Should().Contain(generatedWords[i]);- }- }-- [Fact]- public void GenerateSentences()- {- string rawText = Lipsums.GetText(LipsumsCorpus.LoremIpsum);- var lipsum = new LipsumGenerator(rawText, false);-- int desiredSentenceCount = 5;- string[] generatedSentences = lipsum.- GenerateSentences(desiredSentenceCount, Sentence.Medium);-- generatedSentences.Should().HaveCount(desiredSentenceCount);-- for (int i = 0; i < desiredSentenceCount; i++)- {- generatedSentences[i].Should().NotBeNull();- generatedSentences[i].Should().NotBeEmpty();- }- }-- [Fact]- public void SentenceCapitalizationAndPunctuation()- {- string rawText = "this";- var lipsum = new LipsumGenerator(rawText, false);- string[] generatedSentences = lipsum.GenerateSentences(1, new Sentence(1, 1));- string desiredSentence = "This.";- generatedSentences[0].Should().Be(desiredSentence);- }-- [Fact]- public void GenerateParagraphs()- {- string rawText = Lipsums.GetText(LipsumsCorpus.LoremIpsum);- var lipsum = new LipsumGenerator(rawText, false);-- int desiredParagraphCount = 5;- string[] generatedParagraphs = lipsum.GenerateParagraphs(desiredParagraphCount, Paragraph.Medium);-- generatedParagraphs.Should().HaveCount(desiredParagraphCount);-- for (int i = 0; i < desiredParagraphCount; i++)- {- generatedParagraphs[i].Should().NotBeNull();- generatedParagraphs[i].Should().NotBeEmpty();- }- }-- [Fact]- public void GenerateCharacters()- {- string rawText = "lorem ipsum dolor sit amet consetetur";- int desiredCharacterCount = 10;- string expectedText = rawText.Substring(0, desiredCharacterCount);-- var lipsum = new LipsumGenerator(rawText, false);-- string[] charsRetrieved = lipsum.GenerateCharacters(desiredCharacterCount);-- // This should only retrieve one string- charsRetrieved.Should().HaveCount(1);-- string generatedString = charsRetrieved[0];- generatedString.Should().NotBeNull();- generatedString.Should().NotBeEmpty();-- generatedString.Should().Be(expectedText);- }-- [Fact]- public void RemoveEmptyElements()- {- string[] arrayWithEmpties = new string[] {- "", "lorem", "ipsum", null, String.Empty, "xxx"- };-- string[] expectedArray = new string[] {- "lorem", "ipsum", "xxx"- };-- int expectedLength = 3;-- IReadOnlyList<string> returnedArray = LipsumUtilities.RemoveEmptyElements(arrayWithEmpties);-- returnedArray.Should().HaveCount(expectedLength);- returnedArray.Should().NotContain("");- for (int i = 0; i < returnedArray.Count; i++)- {- returnedArray[i].Should().NotBeNull();- }- returnedArray.Should().BeEquivalentTo(expectedArray);- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Helpers/ListCompareHelperTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Helpers/ListCompareHelperTests.csdeleted file mode 100644index 25dcbf083..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Helpers/ListCompareHelperTests.cs+++ /dev/null@@ -1,177 +0,0 @@-using DevToys.Tools.Helpers;-using DevToys.Tools.Models;--namespace DevToys.UnitTests.Tools.Helpers;--public class ListCompareHelperTests-{- [Theory]- [InlineData("A\nBa\nC\nC", "Ba\nC\nD", "Ba\nC")]- [InlineData("A\rBa\rC\rC", "Ba\rC\rD", "Ba\nC")]- [InlineData("A\r\nBa\r\nC\r\nC", "Ba\r\nC\r\nD", "Ba\nC")]- [InlineData("A\r\nBa\nC\nC", "Ba\nC\r\nD", "Ba\nC")]- internal void CompareWithMultipleSeparators(string listA, string listB, string expectedResult)- {- expectedResult = expectedResult.ReplaceLineEndings();- ResultInfo<string> compareResult = ListCompareHelper.Compare(- listA,- listB,- true,- ListComparisonMode.AInterB,- new MockILogger());-- compareResult.Data.Should().Be(expectedResult);- }-- [Theory]- [InlineData("A\nBa\nC\nBa", "BA\nC\nD", "Ba\nC")]- [InlineData("A\nb\nC", "B\nC\nD", "b\nC")]- [InlineData("A\nB\nC", "D\nE\nF", "")]- [InlineData("A\nB\nC", "", "")]- [InlineData("", "A\nB\nC", "")]- internal void CompareAInterBCaseInsensitive(string listA, string listB, string expectedResult)- {- expectedResult = expectedResult.ReplaceLineEndings();- ResultInfo<string> compareResult = ListCompareHelper.Compare(- listA,- listB,- false,- ListComparisonMode.AInterB,- new MockILogger());-- compareResult.Data.Should().Be(expectedResult);- }-- [Theory]- [InlineData("A\nBa\nC\nC", "Ba\nC\nD", "Ba\nC")]- [InlineData("A\nb\nC", "B\nC\nD", "C")]- [InlineData("A\nB\nC", "D\nE\nF", "")]- [InlineData("A\nb\nC", "", "")]- [InlineData("", "A\nb\nC", "")]- internal void CompareAInterBCaseSensitive(string listA, string listB, string expectedResult)- {- expectedResult = expectedResult.ReplaceLineEndings();- ResultInfo<string> compareResult = ListCompareHelper.Compare(- listA,- listB,- true,- ListComparisonMode.AInterB,- new MockILogger());-- compareResult.Data.Should().Be(expectedResult);- }-- [Theory]- [InlineData("A\nBa\nC\nBa", "BA\nC\nD", "A\nBa\nC\nD")]- [InlineData("A\nb\nC", "B\nC\nD", "A\nb\nC\nD")]- [InlineData("A\nB\nC", "D\nE\nF", "A\nB\nC\nD\nE\nF")]- [InlineData("A\nB\nC", "", "A\nB\nC\n")]- [InlineData("", "A\nB\nC", "\nA\nB\nC")]- internal void CompareAUnionBCaseInsensitive(string listA, string listB, string expectedResult)- {- expectedResult = expectedResult.ReplaceLineEndings();- ResultInfo<string> compareResult = ListCompareHelper.Compare(- listA,- listB,- false,- ListComparisonMode.AUnionB,- new MockILogger());-- compareResult.Data.Should().Be(expectedResult);- }-- [Theory]- [InlineData("A\nBa\nC\nBa", "BA\nC\nD", "A\nBa\nC\nBA\nD")]- [InlineData("A\nb\nC", "B\nC\nD", "A\nb\nC\nB\nD")]- [InlineData("A\nB\nC", "D\nE\nF", "A\nB\nC\nD\nE\nF")]- [InlineData("A\nB\nC", "", "A\nB\nC\n")]- [InlineData("", "A\nB\nC", "\nA\nB\nC")]- internal void CompareAUnionBCaseSensitive(string listA, string listB, string expectedResult)- {- expectedResult = expectedResult.ReplaceLineEndings();- ResultInfo<string> compareResult = ListCompareHelper.Compare(- listA,- listB,- true,- ListComparisonMode.AUnionB,- new MockILogger());-- compareResult.Data.Should().Be(expectedResult);- }-- [Theory]- [InlineData("A\nBa\nC\nc", "Ba\nC\nD", "A")]- [InlineData("A\nb\nC", "B\nC\nD", "A")]- [InlineData("A\nB\nC", "D\nE\nF", "A\nB\nC")]- [InlineData("A\nb\nC", "", "A\nb\nC")]- [InlineData("", "A\nb\nC", "")]- internal void CompareAOnlyCaseInSensitive(string listA, string listB, string expectedResult)- {- expectedResult = expectedResult.ReplaceLineEndings();- ResultInfo<string> compareResult = ListCompareHelper.Compare(- listA,- listB,- false,- ListComparisonMode.AOnly,- new MockILogger());-- compareResult.Data.Should().Be(expectedResult);- }-- [Theory]- [InlineData("A\nBa\nC\nc", "Ba\nC\nD", "A\nc")]- [InlineData("A\nb\nC", "B\nC\nD", "A\nb")]- [InlineData("A\nB\nC", "D\nE\nF", "A\nB\nC")]- [InlineData("A\nb\nC", "", "A\nb\nC")]- [InlineData("", "A\nb\nC", "")]- internal void CompareAOnlyCaseSensitive(string listA, string listB, string expectedResult)- {- expectedResult = expectedResult.ReplaceLineEndings();- ResultInfo<string> compareResult = ListCompareHelper.Compare(- listA,- listB,- true,- ListComparisonMode.AOnly,- new MockILogger());-- compareResult.Data.Should().Be(expectedResult);- }-- [Theory]- [InlineData("A\nBa\nC\nc", "Ba\nC\nD", "D")]- [InlineData("A\nb\nC", "B\nC\nD", "D")]- [InlineData("A\nB\nC", "D\nE\nF", "D\nE\nF")]- [InlineData("A\nb\nC", "", "")]- [InlineData("", "A\nb\nC", "A\nb\nC")]- internal void CompareBOnlyCaseInSensitive(string listA, string listB, string expectedResult)- {- expectedResult = expectedResult.ReplaceLineEndings();- ResultInfo<string> compareResult = ListCompareHelper.Compare(- listA,- listB,- false,- ListComparisonMode.BOnly,- new MockILogger());-- compareResult.Data.Should().Be(expectedResult);- }-- [Theory]- [InlineData("A\nBa\nC\nc", "Ba\nC\nD", "D")]- [InlineData("A\nb\nC", "B\nC\nD", "B\nD")]- [InlineData("A\nB\nC", "D\nE\nF", "D\nE\nF")]- [InlineData("A\nb\nC", "", "")]- [InlineData("", "A\nb\nC", "A\nb\nC")]- internal void CompareBOnlyCaseSensitive(string listA, string listB, string expectedResult)- {- expectedResult = expectedResult.ReplaceLineEndings();- ResultInfo<string> compareResult = ListCompareHelper.Compare(- listA,- listB,- true,- ListComparisonMode.BOnly,- new MockILogger());-- compareResult.Data.Should().Be(expectedResult);- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Helpers/MemoryExtensionsTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Helpers/MemoryExtensionsTests.csdeleted file mode 100644index 04c971b39..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Helpers/MemoryExtensionsTests.cs+++ /dev/null@@ -1,60 +0,0 @@-#nullable enable--using DevToys.Tools.Helpers;-using DevToys.Tools.Models;--namespace DevToys.UnitTests.Tools.Helpers;-public class MemoryExtensionsTests-{- [Theory]- [InlineData(null, false, EndOfLineSequence.Unknown)]- [InlineData("", false, EndOfLineSequence.Unknown)]- [InlineData(" ", false, EndOfLineSequence.Unknown)]- [InlineData("\r", true, EndOfLineSequence.CarriageReturn)]- [InlineData("\n", true, EndOfLineSequence.LineFeed)]- [InlineData("\r\n", true, EndOfLineSequence.CarriageReturnLineFeed)]- [InlineData("\r ", true, EndOfLineSequence.CarriageReturn)]- [InlineData("\n\r", true, EndOfLineSequence.LineFeed)]- [InlineData("\n\r ", true, EndOfLineSequence.LineFeed)]- internal void IsLineBreak(string? input, bool expectedResult, EndOfLineSequence expectedLikeBreakType)- {- bool result = input.AsSpan().IsLineBreak(0, out EndOfLineSequence lineBreakType);-- result.Should().Be(expectedResult);- lineBreakType.Should().Be(expectedLikeBreakType);- }-- [Theory]- [InlineData(null, "")]- [InlineData("", "")]- [InlineData("Hello", "Hello")]- [InlineData("Hello world", "world")]- [InlineData("Hello world.", "world")]- [InlineData("Hello world...", "world")]- [InlineData("Hello world ...", "world")]- [InlineData("Hello world ... ", "world")]- [InlineData("Hello-world", "world")]- internal void GetLastWord(string? input, string? expectedResult)- {- ReadOnlySpan<char> result = input.AsSpan().GetLastWord();-- new string(result).Should().Be(expectedResult);- }-- [Theory]- [InlineData(null, "")]- [InlineData("", "")]- [InlineData("hello", "hello")]- [InlineData("hello\r", "hello", "")]- [InlineData("hello\n", "hello", "")]- [InlineData("hello\r\n", "hello", "")]- [InlineData("hello\n\r", "hello", "", "")]- [InlineData("hello\nworld\rhi", "hello", "world", "hi")]- [InlineData("hello \n world \r hi \r\n ", "hello ", " world ", " hi ", " ")]- internal void ToLines(string? input, params string[] expectLines)- {- List<ReadOnlyMemory<char>> result = input.AsMemory().ToLines();-- result.Select(x => new string(x.Span)).Should().BeEquivalentTo(expectLines);- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Helpers/NumberBaseHelperTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Helpers/NumberBaseHelperTests.csdeleted file mode 100644index e6fe31e33..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Helpers/NumberBaseHelperTests.cs+++ /dev/null@@ -1,474 +0,0 @@-using System.Globalization;-using DevToys.Tools.Helpers;-using DevToys.Tools.Models.NumberBase;-using Decimal = DevToys.Tools.Models.NumberBase.Decimal;--namespace DevToys.UnitTests.Tools.Helpers;--public class NumberBaseHelperTests-{- [Theory]- [InlineData(- "123ABC",- true,- "12 3ABC",- "1,194,684",- "4 435 274",- "0001 0010 0011 1010 1011 1100",- true)]- [InlineData(- "123 ABC",- true,- "12 3ABC",- "1,194,684",- "4 435 274",- "0001 0010 0011 1010 1011 1100",- true)]- [InlineData(- "123abc",- true,- "12 3ABC",- "1,194,684",- "4 435 274",- "0001 0010 0011 1010 1011 1100",- true)]- [InlineData(- "123 abc",- true,- "12 3ABC",- "1,194,684",- "4 435 274",- "0001 0010 0011 1010 1011 1100",- true)]- [InlineData(- "C6AEA155",- true,- "C6AE A155",- "3,333,333,333",- "30 653 520 525",- "1100 0110 1010 1110 1010 0001 0101 0101",- true)]- [InlineData(- "C6AE A155",- true,- "C6AE A155",- "3,333,333,333",- "30 653 520 525",- "1100 0110 1010 1110 1010 0001 0101 0101",- true)]- [InlineData(- "C6AE A15 5",- true,- "C6AE A155",- "3,333,333,333",- "30 653 520 525",- "1100 0110 1010 1110 1010 0001 0101 0101",- true)]- [InlineData(- "FFFF FFFF FFFF FFF6",- true,- "FFFF FFFF FFFF FFF6",- "-10",- "1 777 777 777 777 777 777 766",- "1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 0110",- true)]- [InlineData(- "FFFFFFFFFFFFFFF6",- true,- "FFFF FFFF FFFF FFF6",- "-10",- "1 777 777 777 777 777 777 766",- "1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 0110",- true)]- [InlineData(- "123ABC",- false,- "123ABC",- "1194684",- "4435274",- "000100100011101010111100",- true)]- [InlineData(- "123abc",- false,- "123ABC",- "1194684",- "4435274",- "000100100011101010111100",- true)]- [InlineData(- "C6AEA155",- false,- "C6AEA155",- "3333333333",- "30653520525",- "11000110101011101010000101010101",- true)]- [InlineData(- "FFFFFFFFFFFFFFF6",- false,- "FFFFFFFFFFFFFFF6",- "-10",- "1777777777777777777766",- "1111111111111111111111111111111111111111111111111111111111110110",- true)]- [InlineData(- "123ZER",- true,- "",- "",- "",- "",- false)]- [InlineData(- "123&ER",- true,- "",- "",- "",- "",- false)]- [InlineData(- "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",- true,- "",- "",- "",- "",- false)]- public void ConvertFromHexadecimalWithFormatting(- string input,- bool format,- string expectedHexadecimal,- string expectedDecimal,- string expectedOctal,- string expectedBinary,- bool expectedSuccess)- {- ConvertTest(- Hexadecimal.Instance,- format,- input,- expectedHexadecimal,- expectedDecimal,- expectedOctal,- expectedBinary,- expectedSuccess);- }-- [Theory]- [InlineData(- "18006427676",- true,- "4 3144 481C",- "18,006,427,676",- "206 121 044 034",- "0100 0011 0001 0100 0100 0100 1000 0001 1100",- true)]- [InlineData(- "18,006,427,676",- false,- "43144481C",- "18006427676",- "206121044034",- "010000110001010001000100100000011100",- true)]- [InlineData(- "-18006427676",- true,- "FFFF FFFB CEBB B7E4",- "-18,006,427,676",- "1 777 777 777 571 656 733 744",- "1111 1111 1111 1111 1111 1111 1111 1011 1100 1110 1011 1011 1011 0111 1110 0100",- true)]- [InlineData(- "-18,006,427,676",- false,- "FFFFFFFBCEBBB7E4",- "-18006427676",- "1777777777571656733744",- "1111111111111111111111111111101111001110101110111011011111100100",- true)]- [InlineData(- "-18,006,427,676,999,999,999,999,999,999",- false,- "",- "",- "",- "",- false)]- [InlineData(- "abc",- false,- "",- "",- "",- "",- false)]- public void ConvertFromDecimalWithFormatting(- string input,- bool format,- string expectedHexadecimal,- string expectedDecimal,- string expectedOctal,- string expectedBinary,- bool expectedSuccess)- {- ConvertTest(- Decimal.Instance,- format,- input,- expectedHexadecimal,- expectedDecimal,- expectedOctal,- expectedBinary,- expectedSuccess);- }-- [Theory]- [InlineData(- "30653520525",- true,- "C6AE A155",- "3,333,333,333",- "30 653 520 525",- "1100 0110 1010 1110 1010 0001 0101 0101",- true)]- [InlineData(- "30 653 520 525",- false,- "C6AEA155",- "3333333333",- "30653520525",- "11000110101011101010000101010101",- true)]- [InlineData(- "1777777777747124257253",- true,- "FFFF FFFF 3951 5EAB",- "-3,333,333,333",- "1 777 777 777 747 124 257 253",- "1111 1111 1111 1111 1111 1111 1111 1111 0011 1001 0101 0001 0101 1110 1010 1011",- true)]- [InlineData(- "1 777 777 777 747 124 257 253",- false,- "FFFFFFFF39515EAB",- "-3333333333",- "1777777777747124257253",- "1111111111111111111111111111111100111001010100010101111010101011",- true)]- [InlineData(- "30653520525&",- false,- "",- "",- "",- "",- false)]- [InlineData(- "30 653 520 525 &",- false,- "",- "",- "",- "",- false)]- [InlineData(- "306535205258",- false,- "",- "",- "",- "",- false)]- [InlineData(- "30 653 520 525 8",- false,- "",- "",- "",- "",- false)]- [InlineData(- "306535295256",- false,- "",- "",- "",- "",- false)]- [InlineData(- "30 653 529 525 6",- false,- "",- "",- "",- "",- false)]- [InlineData(- "3065352a5256",- false,- "",- "",- "",- "",- false)]- [InlineData(- "3065352A5256",- false,- "",- "",- "",- "",- false)]- public void ConvertFromOctalWithFormatting(- string input,- bool format,- string expectedHexadecimal,- string expectedDecimal,- string expectedOctal,- string expectedBinary,- bool expectedSuccess)- {- ConvertTest(- Octal.Instance,- format,- input,- expectedHexadecimal,- expectedDecimal,- expectedOctal,- expectedBinary,- expectedSuccess);- }-- [Theory]- [InlineData(- "000101001101",- false,- "14D",- "333",- "515",- "000101001101",- true)]- [InlineData(- "11000110101011101010000101010101",- false,- "C6AEA155",- "3333333333",- "30653520525",- "11000110101011101010000101010101",- true)]- [InlineData(- "111111111 111111111111111111111 1100111001010100010 101111010101011",- false,- "FFFFFFFF39515EAB",- "-3333333333",- "1777777777747124257253",- "1111111111111111111111111111111100111001010100010101111010101011",- true)]- [InlineData(- "0001 0100 1101as",- false,- "",- "",- "",- "",- false)]- [InlineData(- "000101001101&",- false,- "",- "",- "",- "",- false)]- public void ConvertFromBinaryWithFormatting(- string input,- bool format,- string expectedHexadecimal,- string expectedDecimal,- string expectedOctal,- string expectedBinary,- bool expectedSuccess)- {- ConvertTest(- Binary.Instance,- format,- input,- expectedHexadecimal,- expectedDecimal,- expectedOctal,- expectedBinary,- expectedSuccess);- }-- [Theory]- [InlineData("0", ".", true)]- [InlineData("FFFF FFFF FFFF FFFF", "?}: )>)) )')? ; _(", true)]- public void ConvertFromRFC4648Base16ToCustomFormatWithFormatting(- string rfc4648Base16Input,- string expectedResult,- bool expectedSuccess)- {- NumberBaseHelper.TryConvertNumberBase(- rfc4648Base16Input,- RFC4648Base16.Instance,- new CustomUnsigned("./,<>?;':\"[]{ }()-_=+"),- format: true,- out string result,- out string _)- .Should().Be(expectedSuccess);-- result.Should().Be(expectedResult);- }-- [Theory]- [InlineData("0", ".", true)]- [InlineData("FFFF FFFF FFFF FFFF", ",,/> ,,.< .<// >>.. >,>/ ,//, ,><.", true)]- public void ConvertFromRFC4648Base16ToSmallCustomFormatWithFormatting(- string rfc4648Base16Input,- string expectedResult,- bool expectedSuccess)- {- NumberBaseHelper.TryConvertNumberBase(- rfc4648Base16Input,- RFC4648Base16.Instance,- new CustomUnsigned("./,<>"),- format: true,- out string result,- out string _)- .Should().Be(expectedSuccess);-- result.Should().Be(expectedResult);- }-- private static void ConvertTest(- SignedLongNumberBaseDefinition numberBaseDefinition,- bool format,- string input,- string expectedHexadecimal,- string expectedDecimal,- string expectedOctal,- string expectedBinary,- bool expectedSuccess)- {- CultureInfo.CurrentCulture = CultureInfo.InvariantCulture;-- NumberBaseHelper.TryConvertNumberBase(- input,- numberBaseDefinition,- format,- out string hexadecimal,- out string @decimal,- out string octal,- out string binary,- out string _)- .Should().Be(expectedSuccess);-- hexadecimal.Should().Be(expectedHexadecimal);- @decimal.Should().Be(expectedDecimal);- octal.Should().Be(expectedOctal);- binary.Should().Be(expectedBinary);- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Helpers/PasswordGeneratorHelperTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Helpers/PasswordGeneratorHelperTests.csdeleted file mode 100644index 017a960e2..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Helpers/PasswordGeneratorHelperTests.cs+++ /dev/null@@ -1,80 +0,0 @@-using DevToys.Tools.Helpers;--namespace DevToys.UnitTests.Tools.Helpers;--public class PasswordGeneratorHelperTests-{- [Theory]- [InlineData(1, true, false, false, false, null)]- [InlineData(1, false, true, false, false, null)]- [InlineData(1, false, false, true, false, null)]- [InlineData(1, false, false, false, true, null)]- [InlineData(100, true, true, true, true, null)]- [InlineData(100, true, true, true, true, "bcdefghijklmnopqrstuvwxyz")]- [InlineData(100, false, true, false, false, "bcdefghijklmnopqrstuvwxyz")]- internal void GeneratePassword(int length, bool hasUppercase, bool hasLowercase, bool hasNumber, bool hasSpecialCharacters, string excludedCharacters)- {- string password- = PasswordGeneratorHelper.GeneratePassword(- length,- hasUppercase,- hasLowercase,- hasNumber,- hasSpecialCharacters,- excludedCharacters?.ToCharArray());-- password.Should().NotBeNullOrEmpty();- password.Length.Should().Be(length);-- if (hasUppercase)- {- ContainAny(password, PasswordGeneratorHelper.UppercaseLetters);- }- else- {- NotContainAny(password, PasswordGeneratorHelper.UppercaseLetters);- }-- if (hasLowercase)- {- ContainAny(password, PasswordGeneratorHelper.LowercaseLetters);- }- else- {- NotContainAny(password, PasswordGeneratorHelper.LowercaseLetters);- }-- if (hasNumber)- {- ContainAny(password, PasswordGeneratorHelper.Digits);- }- else- {- NotContainAny(password, PasswordGeneratorHelper.Digits);- }-- if (hasSpecialCharacters)- {- ContainAny(password, PasswordGeneratorHelper.NonAlphanumeric);- }- else- {- NotContainAny(password, PasswordGeneratorHelper.NonAlphanumeric);- }-- if (excludedCharacters != null)- {- NotContainAny(password, excludedCharacters);- }- }-- private static void ContainAny(string password, string characters)- {- characters.Should().ContainAny(password.ToCharArray().Select(c => c.ToString()));- }-- private static void NotContainAny(string password, string characters)- {- characters.Should().NotContainAny(password.ToCharArray().Select(c => c.ToString()));- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Helpers/StringHelperTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Helpers/StringHelperTests.csdeleted file mode 100644index 770575a1b..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Helpers/StringHelperTests.cs+++ /dev/null@@ -1,301 +0,0 @@-#nullable enable--using System.Threading;-using DevToys.Tools.Helpers;-using DevToys.Tools.Models;--namespace DevToys.UnitTests.Tools.Helpers;--public class StringHelperTests-{- private const string Text = "Lorem ipsum dolor sit amet takimata sit.\r\n Placerat sed duis clita nonumy tincidunt est facilisis.\r Cum ea elitr consectetuer nonumy diam.\n Eos ut diam laoreet amet minim dolor dolores dolore amet lorem consetetur dolor clita.";- private const string Text2 = "Lorem ipsum dolor sit amet takimata sit.\r\nPlacerat sed duis clita nonumy tincidunt est facilisis.\rCum ea elitr consectetuer nonumy diam.\nEos ut diam laoreet amet minim dolor dolores dolore amet lorem consetetur dolor clita.";-- [Theory]- [InlineData("", 0, 0, 1, 0)]- [InlineData(Text, 0, 0, 1, 0)]- [InlineData(Text, 1, 0, 1, 1)]- [InlineData(Text, 2, 0, 1, 2)]- [InlineData(Text, 2, 1, 1, 2)]- [InlineData(Text, 51, 1, 2, 9)]- [InlineData(Text, 49, 1, 2, 7)]- internal void AnalyzeSpan(string input, int selectionStart, int length, int expectLine, int expectedColumn)- {- StringHelper.AnalyzeSpan(- input,- new TextSpan(selectionStart, length),- CancellationToken.None,- out int _,- out int _,- out int _,- out int spanLineNumber,- out int spanColumnNumber);-- spanLineNumber.Should().Be(expectLine);- spanColumnNumber.Should().Be(expectedColumn);- }-- [Theory]- [InlineData("", 0, 0, 0, 0, 1, 1, EndOfLineSequence.Unknown)]- [InlineData(Text, 226, 226, 35, 4, 1, 4, EndOfLineSequence.Mixed)]- [InlineData("Lorem ipsum dolor sit amet takimata sit.", 40, 40, 7, 1, 1, 1, EndOfLineSequence.Unknown)]- [InlineData("Lorem \nipsum \ndolor \nsit \namet takimata sit.", 44, 44, 7, 1, 1, 5, EndOfLineSequence.LineFeed)]- [InlineData("Lorem \ripsum \rdolor \rsit \ramet takimata sit.", 44, 44, 7, 1, 1, 5, EndOfLineSequence.CarriageReturn)]- [InlineData("Lorem \r\nipsum \r\ndolor \r\nsit \r\namet takimata sit.", 48, 48, 7, 1, 1, 5, EndOfLineSequence.CarriageReturnLineFeed)]- [InlineData("Lorem \n\ripsum \n\rdolor \n\rsit \n\ramet takimata sit.", 48, 48, 7, 1, 5, 9, EndOfLineSequence.Mixed)]- internal void AnalyzeText(- string input,- int expectedByteCount,- int expectedCharacterCount,- int expectedWordCount,- int expectedSentenceCount,- int expectedParagraphCount,- int expectedLineCount,- EndOfLineSequence expectedOverallLineBreakType)- {- StringHelper.AnalyzeText(- input,- CancellationToken.None,- out int byteCount,- out int characterCount,- out int wordCount,- out int sentenceCount,- out int paragraphCount,- out int lineCount,- out EndOfLineSequence overallLineBreakType,- out Dictionary<char, int>? _,- out Dictionary<string, int>? _);-- byteCount.Should().Be(expectedByteCount);- characterCount.Should().Be(expectedCharacterCount);- wordCount.Should().Be(expectedWordCount);- sentenceCount.Should().Be(expectedSentenceCount);- paragraphCount.Should().Be(expectedParagraphCount);- lineCount.Should().Be(expectedLineCount);- overallLineBreakType.Should().Be(expectedOverallLineBreakType);- }-- [Fact]- internal void SentenceCase()- {- string result = StringHelper.ConvertToSentenceCase(Text, CancellationToken.None);- result- .Should()- .Be("Lorem ipsum dolor sit amet takimata sit.\r\n Placerat sed duis clita nonumy tincidunt est facilisis.\r Cum ea elitr consectetuer nonumy diam.\n Eos ut diam laoreet amet minim dolor dolores dolore amet lorem consetetur dolor clita.");- }-- [Fact]- internal void TitleCase()- {- string result = StringHelper.ConvertToTitleCase(Text, CancellationToken.None);- result- .Should()- .Be("Lorem Ipsum Dolor Sit Amet Takimata Sit.\r\n Placerat Sed Duis Clita Nonumy Tincidunt Est Facilisis.\r Cum Ea Elitr Consectetuer Nonumy Diam.\n Eos Ut Diam Laoreet Amet Minim Dolor Dolores Dolore Amet Lorem Consetetur Dolor Clita.");- }-- [Fact]- internal void PascalCase()- {- string result = StringHelper.ConvertToPascalCase(Text, CancellationToken.None);- result- .Should()- .Be("LoremIpsumDolorSitAmetTakimataSit\r\nPlaceratSedDuisClitaNonumyTinciduntEstFacilisis\rCumEaElitrConsectetuerNonumyDiam\nEosUtDiamLaoreetAmetMinimDolorDoloresDoloreAmetLoremConseteturDolorClita");- }-- [Fact]- internal void SnakeCase()- {- string result = StringHelper.ConvertToSnakeCase(Text, CancellationToken.None);- result- .Should()- .Be("lorem_ipsum_dolor_sit_amet_takimata_sit\r\nplacerat_sed_duis_clita_nonumy_tincidunt_est_facilisis\rcum_ea_elitr_consectetuer_nonumy_diam\neos_ut_diam_laoreet_amet_minim_dolor_dolores_dolore_amet_lorem_consetetur_dolor_clita");- }-- [Fact]- internal void ConstantCase()- {- string result = StringHelper.ConvertToConstantCase(Text, CancellationToken.None);- result- .Should()- .Be("LOREM_IPSUM_DOLOR_SIT_AMET_TAKIMATA_SIT\r\nPLACERAT_SED_DUIS_CLITA_NONUMY_TINCIDUNT_EST_FACILISIS\rCUM_EA_ELITR_CONSECTETUER_NONUMY_DIAM\nEOS_UT_DIAM_LAOREET_AMET_MINIM_DOLOR_DOLORES_DOLORE_AMET_LOREM_CONSETETUR_DOLOR_CLITA");- }-- [Fact]- internal void KebabCase()- {- string result = StringHelper.ConvertToKebabCase(Text, CancellationToken.None);- result- .Should()- .Be("lorem-ipsum-dolor-sit-amet-takimata-sit\r\nplacerat-sed-duis-clita-nonumy-tincidunt-est-facilisis\rcum-ea-elitr-consectetuer-nonumy-diam\neos-ut-diam-laoreet-amet-minim-dolor-dolores-dolore-amet-lorem-consetetur-dolor-clita");- }-- [Fact]- internal void CobolCase()- {- string result = StringHelper.ConvertToCobolCase(Text, CancellationToken.None);- result- .Should()- .Be("LOREM-IPSUM-DOLOR-SIT-AMET-TAKIMATA-SIT\r\nPLACERAT-SED-DUIS-CLITA-NONUMY-TINCIDUNT-EST-FACILISIS\rCUM-EA-ELITR-CONSECTETUER-NONUMY-DIAM\nEOS-UT-DIAM-LAOREET-AMET-MINIM-DOLOR-DOLORES-DOLORE-AMET-LOREM-CONSETETUR-DOLOR-CLITA");- }-- [Fact]- internal void TrainCase()- {- string result = StringHelper.ConvertToTrainCase(Text, CancellationToken.None);- result- .Should()- .Be("Lorem-Ipsum-Dolor-Sit-Amet-Takimata-Sit\r\nPlacerat-Sed-Duis-Clita-Nonumy-Tincidunt-Est-Facilisis\rCum-Ea-Elitr-Consectetuer-Nonumy-Diam\nEos-Ut-Diam-Laoreet-Amet-Minim-Dolor-Dolores-Dolore-Amet-Lorem-Consetetur-Dolor-Clita");- }-- [Fact]- internal void AlternatingCase()- {- string result = StringHelper.ConvertToAlternatingCase(Text, CancellationToken.None);- result- .Should()- .Be("lOrEm iPsUm dOlOr sIt aMeT TaKiMaTa sIt.\r\n PlAcErAt sEd dUiS ClItA NoNuMy tInCiDuNt eSt fAcIlIsIs.\r cUm eA ElItR CoNsEcTeTuEr nOnUmY DiAm.\n eOs uT DiAm lAoReEt aMeT MiNiM DoLoR DoLoReS DoLoRe aMeT LoReM CoNsEtEtUr dOlOr cLiTa.");- }-- [Fact]- internal void InverseCase()- {- string result = StringHelper.ConvertToInverseCase(Text, CancellationToken.None);- result- .Should()- .Be("LoReM IpSuM DoLoR SiT AmEt tAkImAtA SiT.\r\n pLaCeRaT SeD DuIs cLiTa nOnUmY TiNcIdUnT EsT FaCiLiSiS.\r CuM Ea eLiTr cOnSeCtEtUeR NoNuMy dIaM.\n EoS Ut dIaM LaOrEeT AmEt mInIm dOlOr dOlOrEs dOlOrE AmEt lOrEm cOnSeTeTuR DoLoR ClItA.");- }-- [Fact]- internal void RandomCase()- {- string result = StringHelper.ConvertToRandomCase(Text, CancellationToken.None);-- result.Should().BeEquivalentTo(Text);- result.Should().NotBe(Text);- }-- [Theory]- [InlineData("", EndOfLineSequence.Unknown)]- [InlineData(Text, EndOfLineSequence.Mixed)]- [InlineData("Lorem ipsum dolor sit amet takimata sit.", EndOfLineSequence.Unknown)]- [InlineData("Lorem \nipsum \ndolor \nsit \namet takimata sit.", EndOfLineSequence.LineFeed)]- [InlineData("Lorem \ripsum \rdolor \rsit \ramet takimata sit.", EndOfLineSequence.CarriageReturn)]- [InlineData("Lorem \r\nipsum \r\ndolor \r\nsit \r\namet takimata sit.", EndOfLineSequence.CarriageReturnLineFeed)]- [InlineData("Lorem \n\ripsum \n\rdolor \n\rsit \n\ramet takimata sit.", EndOfLineSequence.Mixed)]- internal void DetectLineBreakKind(string input, EndOfLineSequence expectedLineBreak)- {- EndOfLineSequence result = StringHelper.DetectLineBreakKind(input, CancellationToken.None);- result- .Should()- .Be(expectedLineBreak);- }-- [Theory]- [InlineData("", "")]- [InlineData(Text, "Lorem ipsum dolor sit amet takimata sit.\n Placerat sed duis clita nonumy tincidunt est facilisis.\n Cum ea elitr consectetuer nonumy diam.\n Eos ut diam laoreet amet minim dolor dolores dolore amet lorem consetetur dolor clita.")]- [InlineData("Lorem ipsum dolor sit amet takimata sit.", "Lorem ipsum dolor sit amet takimata sit.")]- [InlineData("Lorem \nipsum \ndolor \nsit \namet takimata sit.", "Lorem \nipsum \ndolor \nsit \namet takimata sit.")]- [InlineData("Lorem \ripsum \rdolor \rsit \ramet takimata sit.", "Lorem \nipsum \ndolor \nsit \namet takimata sit.")]- [InlineData("Lorem \r\nipsum \r\ndolor \r\nsit \r\namet takimata sit.", "Lorem \nipsum \ndolor \nsit \namet takimata sit.")]- [InlineData("Lorem \n\ripsum \n\rdolor \n\rsit \n\ramet takimata sit.", "Lorem \n\nipsum \n\ndolor \n\nsit \n\namet takimata sit.")]- internal void ConvertLineBreakToLF(string input, string expectedResult)- {- string result = StringHelper.ConvertLineBreakToLF(input);- result- .Should()- .Be(expectedResult);- }-- [Theory]- [InlineData("", "")]- [InlineData(Text, "Lorem ipsum dolor sit amet takimata sit.\r\n Placerat sed duis clita nonumy tincidunt est facilisis.\r\n Cum ea elitr consectetuer nonumy diam.\r\n Eos ut diam laoreet amet minim dolor dolores dolore amet lorem consetetur dolor clita.")]- [InlineData("Lorem ipsum dolor sit amet takimata sit.", "Lorem ipsum dolor sit amet takimata sit.")]- [InlineData("Lorem \nipsum \ndolor \nsit \namet takimata sit.", "Lorem \r\nipsum \r\ndolor \r\nsit \r\namet takimata sit.")]- [InlineData("Lorem \ripsum \rdolor \rsit \ramet takimata sit.", "Lorem \r\nipsum \r\ndolor \r\nsit \r\namet takimata sit.")]- [InlineData("Lorem \r\nipsum \r\ndolor \r\nsit \r\namet takimata sit.", "Lorem \r\nipsum \r\ndolor \r\nsit \r\namet takimata sit.")]- [InlineData("Lorem \n\ripsum \n\rdolor \n\rsit \n\ramet takimata sit.", "Lorem \r\n\r\nipsum \r\n\r\ndolor \r\n\r\nsit \r\n\r\namet takimata sit.")]- internal void ConvertLineBreakToCRLF(string input, string expectedResult)- {- string result = StringHelper.ConvertLineBreakToCRLF(input);- result- .Should()- .Be(expectedResult);- }-- [Fact]- internal void SortLinesAlphabetically()- {- string result = StringHelper.SortLinesAlphabetically(Text2, EndOfLineSequence.CarriageReturnLineFeed);- result- .Should()- .Be("Cum ea elitr consectetuer nonumy diam.\r\nEos ut diam laoreet amet minim dolor dolores dolore amet lorem consetetur dolor clita.\r\nLorem ipsum dolor sit amet takimata sit.\r\nPlacerat sed duis clita nonumy tincidunt est facilisis.");- }-- [Fact]- internal void SortLinesAlphabeticallyDescending()- {- string result = StringHelper.SortLinesAlphabeticallyDescending(Text2, EndOfLineSequence.CarriageReturnLineFeed);- result- .Should()- .Be("Placerat sed duis clita nonumy tincidunt est facilisis.\r\nLorem ipsum dolor sit amet takimata sit.\r\nEos ut diam laoreet amet minim dolor dolores dolore amet lorem consetetur dolor clita.\r\nCum ea elitr consectetuer nonumy diam.");- }-- [Fact]- internal void SortLinesByLastWord()- {- string result = StringHelper.SortLinesByLastWord(Text2, EndOfLineSequence.CarriageReturnLineFeed);- result- .Should()- .Be("Eos ut diam laoreet amet minim dolor dolores dolore amet lorem consetetur dolor clita.\r\nCum ea elitr consectetuer nonumy diam.\r\nPlacerat sed duis clita nonumy tincidunt est facilisis.\r\nLorem ipsum dolor sit amet takimata sit.");- }-- [Fact]- internal void SortLinesByLastWordDescending()- {- string result = StringHelper.SortLinesByLastWordDescending(Text2, EndOfLineSequence.CarriageReturnLineFeed);- result- .Should()- .Be("Lorem ipsum dolor sit amet takimata sit.\r\nPlacerat sed duis clita nonumy tincidunt est facilisis.\r\nCum ea elitr consectetuer nonumy diam.\r\nEos ut diam laoreet amet minim dolor dolores dolore amet lorem consetetur dolor clita.");- }-- [Fact]- internal void ReverseLines()- {- string result = StringHelper.ReverseLines(Text2, EndOfLineSequence.CarriageReturnLineFeed);- result- .Should()- .Be("Eos ut diam laoreet amet minim dolor dolores dolore amet lorem consetetur dolor clita.\r\nCum ea elitr consectetuer nonumy diam.\r\nPlacerat sed duis clita nonumy tincidunt est facilisis.\r\nLorem ipsum dolor sit amet takimata sit.");- }-- [Fact]- internal void ShuffleLines()- {- string result = StringHelper.ShuffleLines(Text2, EndOfLineSequence.CarriageReturnLineFeed);- result- .Should()- .NotBe(Text2);- }-- [Theory]- [InlineData(null, "")]- [InlineData("", "")]- [InlineData("hello world", "hello world")]- [InlineData("hello\rworld", "hello\\rworld")]- internal void EscapeString(string input, string expectedResult)- {- StringHelper.EscapeString(input, new MockILogger(), CancellationToken.None)- .Data.Should().Be(expectedResult);- }-- [Theory]- [InlineData(null, "")]- [InlineData("", "")]- [InlineData("hello world", "hello world")]- [InlineData("hello\rworld", "hello\rworld")]- [InlineData("hello\\rworld", "hello\rworld")]- internal void UnescapeString(string input, string expectedResult)- {- StringHelper.UnescapeString(input, new MockILogger(), CancellationToken.None)- .Data.Should().Be(expectedResult);- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Helpers/UrlHelperTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Helpers/UrlHelperTests.csdeleted file mode 100644index a5ac39a4d..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Helpers/UrlHelperTests.cs+++ /dev/null@@ -1,35 +0,0 @@-using System.Threading;-using DevToys.Tools.Helpers;--namespace DevToys.UnitTests.Tools.Helpers;--public class UrlHelperTests-{- [Theory]- [InlineData(null, "")]- [InlineData("<hello world>", "%3Chello%20world%3E")]- [InlineData("%3Chello%20world%3E", "%253Chello%2520world%253E")]- internal void EncodeUrl(string input, string expectedResult)- {- UrlHelper.EncodeUrlData(- input,- new MockILogger(),- CancellationToken.None)- .Should()- .Be(expectedResult);- }-- [Theory]- [InlineData(null, "")]- [InlineData("%3Chello%20world%3E", "<hello world>")]- [InlineData("%253Chello%2520world%253E", "%3Chello%20world%3E")]- internal void DecodeUrl(string input, string expectedResult)- {- UrlHelper.DecodeUrlData(- input,- new MockILogger(),- CancellationToken.None)- .Should()- .Be(expectedResult);- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Helpers/UuidHelperTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Helpers/UuidHelperTests.csdeleted file mode 100644index 30513f762..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Helpers/UuidHelperTests.cs+++ /dev/null@@ -1,34 +0,0 @@-using DevToys.Tools.Helpers;-using DevToys.Tools.Models;--namespace DevToys.UnitTests.Tools.Helpers;--public class UuidHelperTests-{- [Theory]- [InlineData(UuidVersion.One, true, true)]- [InlineData(UuidVersion.One, false, true)]- [InlineData(UuidVersion.One, true, false)]- [InlineData(UuidVersion.One, false, false)]- [InlineData(UuidVersion.Four, true, true)]- [InlineData(UuidVersion.Four, false, true)]- [InlineData(UuidVersion.Four, true, false)]- [InlineData(UuidVersion.Four, false, false)]- internal void GenerateUuid(UuidVersion uuidVersion, bool hyphens, bool uppercase)- {- string newUuid- = UuidHelper.GenerateUuid(- uuidVersion,- hyphens,- uppercase);- TestUuid(newUuid, hyphens, uppercase);- }-- private static void TestUuid(string uuid, bool hyphens, bool uppercase)- {- Guid.TryParse(uuid, out _).Should().BeTrue();- uuid.Contains('-').Should().Be(hyphens);- uuid.Length.Should().Be(hyphens ? 36 : 32);- uuid.Should().Be(uppercase ? uuid.ToUpperInvariant() : uuid.ToLowerInvariant());- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Helpers/XmlHelperTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Helpers/XmlHelperTests.csdeleted file mode 100644index 207b4aab5..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Helpers/XmlHelperTests.cs+++ /dev/null@@ -1,100 +0,0 @@-using DevToys.Tools.Helpers;-using DevToys.Tools.Models;-using DevToys.UnitTests.Mocks;--namespace DevToys.UnitTests.Tools.Helpers;--public class XmlHelperTests-{- [Theory]- [InlineData(null, false)]- [InlineData("", false)]- [InlineData(" ", false)]- [InlineData("<>", false)]- [InlineData("</>", false)]- [InlineData("<xml />", true)]- [InlineData("<root><xml /></root> ", true)]- [InlineData(" <root><xml test=\"true\" /></root>", true)]- [InlineData(" <root><xml test=\"true\" /></root ", false)]- public void IsValid(string input, bool expectedResult)- {- XmlHelper.IsValid(input, new MockILogger()).Should().Be(expectedResult);- }-- [Theory]- [InlineData(null, "")]- [InlineData("", "")]- [InlineData(" ", "")]- [InlineData("<xml />", "<xml />")]- [InlineData("<root><xml /></root>", "<root>\r\n <xml />\r\n</root>")]- [InlineData("<root><xml test=\"true\" /></root>", "<root>\r\n <xml test=\"true\" />\r\n</root>", false)]- [InlineData("<root><xml test=\"true\" /></root>", "<root>\r\n <xml\r\n test=\"true\" />\r\n</root>", true)]- public void FormatTwoSpaces(string input, string expectedResult, bool newLineOnAttributes = false)- {- expectedResult = expectedResult.Replace("\r\n", Environment.NewLine);- ResultInfo<string> actual = XmlHelper.Format(input, Indentation.TwoSpaces, newLineOnAttributes, new MockILogger());- actual.Data.Should().Be(expectedResult);- }-- [Theory]- [InlineData(null, "")]- [InlineData("", "")]- [InlineData(" ", "")]- [InlineData("<xml />", "<xml />")]- [InlineData("<root><xml /></root>", "<root>\r\n <xml />\r\n</root>")]- [InlineData("<root><xml test=\"true\" /></root>", "<root>\r\n <xml test=\"true\" />\r\n</root>", false)]- [InlineData("<root><xml test=\"true\" /></root>", "<root>\r\n <xml\r\n test=\"true\" />\r\n</root>", true)]- public void FormatFourSpaces(string input, string expectedResult, bool newLineOnAttributes = false)- {- expectedResult = expectedResult.Replace("\r\n", Environment.NewLine);- ResultInfo<string> actual = XmlHelper.Format(input, Indentation.FourSpaces, newLineOnAttributes, new MockILogger());- actual.Data.Should().Be(expectedResult);- }-- [Theory]- [InlineData(null, "")]- [InlineData("", "")]- [InlineData(" ", "")]- [InlineData("<xml />", "<xml />")]- [InlineData("<root><xml /></root>", "<root>\r\n\t<xml />\r\n</root>")]- [InlineData("<root><xml test=\"true\" /></root>", "<root>\r\n\t<xml test=\"true\" />\r\n</root>", false)]- [InlineData("<root><xml test=\"true\" /></root>", "<root>\r\n\t<xml\r\n\t\ttest=\"true\" />\r\n</root>", true)]- public void FormatOneTab(string input, string expectedResult, bool newLineOnAttributes = false)- {- expectedResult = expectedResult.Replace("\r\n", Environment.NewLine);- ResultInfo<string> actual = XmlHelper.Format(input, Indentation.OneTab, newLineOnAttributes, new MockILogger());- actual.Data.Should().Be(expectedResult);- }-- [Theory]- [InlineData(null, "")]- [InlineData("", "")]- [InlineData(" ", "")]- [InlineData("<xml />", "<xml />")]- [InlineData("<root>\r\n <xml />\r\n</root>", "<root><xml /></root>")]- [InlineData("<root>\r\n <xml />\r\n</root>", "<root><xml /></root>")]- [InlineData("<root>\r\n <xml test=\"true\" />\r\n</root>", "<root><xml test=\"true\" /></root>", false)]- [InlineData("<root>\r\n <xml\r\n test=\"true\" />\r\n</root>", "<root><xml test=\"true\" /></root>", true)]- [InlineData("<root>\r\n\t<xml />\r\n</root>", "<root><xml /></root>")]- [InlineData("<root>\r\n\t<xml test=\"true\" />\r\n</root>", "<root><xml test=\"true\" /></root>", false)]- [InlineData("<root>\r\n\t<xml\r\n\t\ttest=\"true\" />\r\n</root>", "<root><xml test=\"true\" /></root>", true)]- public void FormatMinified(string input, string expectedResult, bool newLineOnAttributes = false)- {- ResultInfo<string> actual = XmlHelper.Format(input, Indentation.Minified, newLineOnAttributes, new MockILogger());- actual.Data.Should().Be(expectedResult);- }-- [Theory]- [InlineData(null, "")]- [InlineData("", "")]- [InlineData("<?xml version=\"1.0\" ?><Document version=\"0.1\"><Element /></Document>", "<?xml version=\"1.0\" ?><Document version=\"0.1\"><Element /></Document>")]- [InlineData("<?xml version=\"1.0\" encoding=\"utf-8\"?><Document version=\"0.1\"><Element /></Document>", "<?xml version=\"1.0\" encoding=\"utf-8\"?><Document version=\"0.1\"><Element /></Document>")]- [InlineData("<?xml version=\"1.0\" encoding=\"utf-16\"?><Document version=\"0.1\"><Element /></Document>", "<?xml version=\"1.0\" encoding=\"utf-16\"?><Document version=\"0.1\"><Element /></Document>")]- [InlineData("<?xml version=\"1.0\" encoding=\"test\"?><Document version=\"0.1\"><Element /></Document>", "<?xml version=\"1.0\" encoding=\"test\"?><Document version=\"0.1\"><Element /></Document>")]- [InlineData("<Document version=\"0.1\"><Element /></Document>", "<Document version=\"0.1\"><Element /></Document>")]- public void CheckEncoding(string input, string expectedResult, bool newLineOnAttributes = false)- {- ResultInfo<string> actual = XmlHelper.Format(input, Indentation.Minified, newLineOnAttributes, new MockILogger());- actual.Data.Should().Be(expectedResult);- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Helpers/XsdHelperTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Helpers/XsdHelperTests.csdeleted file mode 100644index 93fb833c2..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Helpers/XsdHelperTests.cs+++ /dev/null@@ -1,98 +0,0 @@-using System.Threading;-using System.Threading.Tasks;-using DevToys.Tools.Helpers;-using DevToys.Tools.Models;-using DevToys.UnitTests.Mocks;--namespace DevToys.UnitTests.Tools.Helpers;--public class XsdHelperTests-{- [Fact]- public async Task ValidateXml_InvalidXmlFile()- {- string xsdSchemaString = await TestDataProvider.GetEmbeddedFileContent("DevToys.UnitTests.Tools.TestData.XMLTester.ValidXsd.xml");- string xmlDataString = await TestDataProvider.GetEmbeddedFileContent("DevToys.UnitTests.Tools.TestData.XMLTester.InvalidXml.xml");-- ResultInfo<string, XMLTesterResultSeverity> result = XsdHelper.ValidateXmlAgainstXsd(xsdSchemaString, xmlDataString, new MockILogger(), CancellationToken.None);-- result.Severity.Should().Be(XMLTesterResultSeverity.Error);- }-- [Fact]- public async Task ValidateXml_ValidXmlSchema()- {- string xsdSchemaString = await TestDataProvider.GetEmbeddedFileContent("DevToys.UnitTests.Tools.TestData.XMLTester.ValidXsd.xml");- string xmlDataString = await TestDataProvider.GetEmbeddedFileContent("DevToys.UnitTests.Tools.TestData.XMLTester.ValidXml.xml");-- ResultInfo<string, XMLTesterResultSeverity> result = XsdHelper.ValidateXmlAgainstXsd(xsdSchemaString, xmlDataString, new MockILogger(), CancellationToken.None);-- result.Severity.Should().Be(XMLTesterResultSeverity.Success);- }-- [Fact]- public async Task ValidateXml_InvalidXsdSchema()- {- string xsdSchemaString = await TestDataProvider.GetEmbeddedFileContent("DevToys.UnitTests.Tools.TestData.XMLTester.InvalidXsd.xml");- string xmlDataString = await TestDataProvider.GetEmbeddedFileContent("DevToys.UnitTests.Tools.TestData.XMLTester.ValidXml.xml");-- ResultInfo<string, XMLTesterResultSeverity> result = XsdHelper.ValidateXmlAgainstXsd(xsdSchemaString, xmlDataString, new MockILogger(), CancellationToken.None);-- result.Severity.Should().Be(XMLTesterResultSeverity.Error);- }-- [Fact]- public async Task ValidateXml_NoNamespacesMissing()- {- string xsdSchemaString = await TestDataProvider.GetEmbeddedFileContent("DevToys.UnitTests.Tools.TestData.XMLTester.ValidXsdWithNamespace.xml");- string xmlDataString = await TestDataProvider.GetEmbeddedFileContent("DevToys.UnitTests.Tools.TestData.XMLTester.ValidXmlWithNamespace.xml");-- ResultInfo<string, XMLTesterResultSeverity> result = XsdHelper.ValidateXmlAgainstXsd(xsdSchemaString, xmlDataString, new MockILogger(), CancellationToken.None);-- result.Severity.Should().Be(XMLTesterResultSeverity.Success);- }-- [Fact]- public async Task ValidateXml_XsdTargetNamespaceIsNotPredefinedElsewhereInXsdHeader()- {- string xsdSchemaString = await TestDataProvider.GetEmbeddedFileContent("DevToys.UnitTests.Tools.TestData.XMLTester.ValidXsd.xml");- string xmlDataString = await TestDataProvider.GetEmbeddedFileContent("DevToys.UnitTests.Tools.TestData.XMLTester.ValidXml.xml");-- ResultInfo<string, XMLTesterResultSeverity> result = XsdHelper.ValidateXmlAgainstXsd(xsdSchemaString, xmlDataString, new MockILogger(), CancellationToken.None);-- result.Severity.Should().Be(XMLTesterResultSeverity.Success);- }-- [Fact]- public async Task ValidateXml_NamespacesMissingInXml()- {- string xsdSchemaString = await TestDataProvider.GetEmbeddedFileContent("DevToys.UnitTests.Tools.TestData.XMLTester.ValidXsdWithNamespace.xml");- string xmlDataString = await TestDataProvider.GetEmbeddedFileContent("DevToys.UnitTests.Tools.TestData.XMLTester.ValidXmlWithoutNamespace.xml");-- ResultInfo<string, XMLTesterResultSeverity> result = XsdHelper.ValidateXmlAgainstXsd(xsdSchemaString, xmlDataString, new MockILogger(), CancellationToken.None);-- result.Severity.Should().Be(XMLTesterResultSeverity.Warning);- }-- [Fact]- public async Task ValidateXml_NamespacesMissingInXsd()- {- string xsdSchemaString = await TestDataProvider.GetEmbeddedFileContent("DevToys.UnitTests.Tools.TestData.XMLTester.ValidXsdWithoutNamespace.xml");- string xmlDataString = await TestDataProvider.GetEmbeddedFileContent("DevToys.UnitTests.Tools.TestData.XMLTester.ValidXmlWithNamespace.xml");-- ResultInfo<string, XMLTesterResultSeverity> result = XsdHelper.ValidateXmlAgainstXsd(xsdSchemaString, xmlDataString, new MockILogger(), CancellationToken.None);-- result.Severity.Should().Be(XMLTesterResultSeverity.Warning);- }-- [Fact]- public async Task ValidateXml_XmlIsMissingTargetedNamespace()- {- string xsdSchemaString = await TestDataProvider.GetEmbeddedFileContent("DevToys.UnitTests.Tools.TestData.XMLTester.ValidXsdOnlyWithTargetNamespace.xml");- string xmlDataString = await TestDataProvider.GetEmbeddedFileContent("DevToys.UnitTests.Tools.TestData.XMLTester.ValidXmlWithoutNamespace.xml");-- ResultInfo<string, XMLTesterResultSeverity> result = XsdHelper.ValidateXmlAgainstXsd(xsdSchemaString, xmlDataString, new MockILogger(), CancellationToken.None);-- result.Severity.Should().Be(XMLTesterResultSeverity.Warning);- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Helpers/YamlHelperTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Helpers/YamlHelperTests.csdeleted file mode 100644index e30ff019f..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Helpers/YamlHelperTests.cs+++ /dev/null@@ -1,128 +0,0 @@-using System.Threading;-using DevToys.Tools.Helpers;-using DevToys.Tools.Models;--namespace DevToys.UnitTests.Tools.Helpers;--public class YamlHelperTests-{- [Theory]- [InlineData(null, false)]- [InlineData("", false)]- [InlineData(" ", false)]- [InlineData("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.", false)]- [InlineData("foo :\n bar :\n - boo: 1\n - rab: 2\n - plop: 3", true)]- public void IsValid(string input, bool expectedResult)- {- YamlHelper.IsValid(input, new MockILogger()).Should().Be(expectedResult);- }-- [Theory]- [InlineData(null, "")]- [InlineData("", "")]- [InlineData(" ", "")]- public void ConvertFromJsonShouldReturnEmptyString(string input, string expected)- {- // prepare & act- ResultInfo<string> actual = YamlHelper.ConvertFromJson(- input,- Indentation.FourSpaces,- new MockILogger(),- CancellationToken.None);-- actual.HasSucceeded.Should().BeFalse();- actual.Data.Should().Be(expected);- }-- [Fact(DisplayName = "Convert From Json with unsupported Indentation")]- public void ConvertFromJsonWithUnsupportedIndentationShouldReturnEmptyString()- {- // prepare- string input = "{}";- string expected = string.Empty;-- // act- ResultInfo<string> actual = YamlHelper.ConvertFromJson(- input,- Indentation.Minified,- new MockILogger(),- CancellationToken.None);-- actual.HasSucceeded.Should().BeFalse();- actual.Data.Should().Be(expected);- }-- [Fact(DisplayName = "Convert From Json with unsupported Json")]- public void ConvertFromJsonWithUnsupportedJsonShouldExceptionMessage()- {- // prepare- string input = "-";- string expected = "Expected a digit ('0'-'9'), but instead reached end of data. LineNumber: 0 | BytePositionInLine: 1.";-- // act- ResultInfo<string> actual = YamlHelper.ConvertFromJson(- input,- Indentation.Minified,- new MockILogger(),- CancellationToken.None);-- actual.HasSucceeded.Should().BeFalse();- actual.Data.Should().Be(expected);- }-- [Theory]- [InlineData("{\r\n \"key\": \"value\"\r\n }", "key: value\r\n")]- [InlineData("{\r\n \"key\": \"value\",\r\n \"key2\": 1\r\n }", "key: value\r\nkey2: 1\r\n")]- public void ConvertFromJsonWithTwoSpaces(string input, string expectedResult)- {- expectedResult = expectedResult.Replace("\r\n", Environment.NewLine);- ResultInfo<string> result = YamlHelper.ConvertFromJson(- input,- Indentation.TwoSpaces,- new MockILogger(),- CancellationToken.None);- result.Data.Should().Be(expectedResult);- }-- [Theory]- [InlineData("{\r\n \"key\": \"value\"\r\n }", "key: value\r\n")]- [InlineData("{\r\n \"key\": \"value\",\r\n \"key2\": 1\r\n }", "key: value\r\nkey2: 1\r\n")]- public void ConvertFromJsonWithFourSpaces(string input, string expectedResult)- {- expectedResult = expectedResult.Replace("\r\n", Environment.NewLine);- ResultInfo<string> result = YamlHelper.ConvertFromJson(- input,- Indentation.FourSpaces,- new MockILogger(),- CancellationToken.None);- result.Data.Should().Be(expectedResult);- }-- [Theory]- [InlineData("[\r\n {\r\n \"key\": \"value\"\r\n }\r\n]", "- key: value\r\n")]- [InlineData("[\r\n {\r\n \"key\": \"value\",\r\n \"key2\": 1\r\n }\r\n]", "- key: value\r\n key2: 1\r\n")]- public void ConvertFromJsonWithJsonRootArrayWithTwoSpaces(string input, string expectedResult)- {- expectedResult = expectedResult.Replace("\r\n", Environment.NewLine);- ResultInfo<string> result = YamlHelper.ConvertFromJson(- input,- Indentation.TwoSpaces,- new MockILogger(),- CancellationToken.None);- result.Data.Should().Be(expectedResult);- }-- [Theory]- [InlineData("[\r\n {\r\n \"key\": \"value\"\r\n }\r\n]", "- key: value\r\n")]- [InlineData("[\r\n {\r\n \"key\": \"value\",\r\n \"key2\": 1\r\n }\r\n]", "- key: value\r\n key2: 1\r\n")]- public void ConvertFromJsonWithJsonRootArrayWithFourSpaces(string input, string expectedResult)- {- expectedResult = expectedResult.Replace("\r\n", Environment.NewLine);- ResultInfo<string> result = YamlHelper.ConvertFromJson(- input,- Indentation.FourSpaces,- new MockILogger(),- CancellationToken.None);- result.Data.Should().Be(expectedResult);- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Models/NumberBase/BinaryTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Models/NumberBase/BinaryTests.csdeleted file mode 100644index 4477504b8..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Models/NumberBase/BinaryTests.cs+++ /dev/null@@ -1,26 +0,0 @@-using DevToys.Tools.Models.NumberBase;--namespace DevToys.UnitTests.Tools.Models.NumberBase;--public class BinaryTests-{- [Theory]- [InlineData(333, "0001 0100 1101")]- [InlineData(1869, "0111 0100 1101")]- [InlineData(3917, "1111 0100 1101")]- [InlineData(long.MinValue, "1000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000")]- [InlineData(long.MaxValue, "0111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111")]- public void FormatBinary(long input, string expectedResult)- {- Binary.Instance.ToFormattedString(input, true).Should().Be(expectedResult);- }-- [Theory]- [InlineData("1000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000", long.MinValue)]- [InlineData("0111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111 1111", long.MaxValue)]- public void ParseBinary(string input, long expectedResult)- {- input = input.Replace(" ", string.Empty);- Binary.Instance.Parse(input).Should().Be(expectedResult);- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Models/NumberBase/DecimalTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Models/NumberBase/DecimalTests.csdeleted file mode 100644index 59496cf5c..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Models/NumberBase/DecimalTests.cs+++ /dev/null@@ -1,29 +0,0 @@-using System.Globalization;-using Decimal = DevToys.Tools.Models.NumberBase.Decimal;--namespace DevToys.UnitTests.Tools.Models.NumberBase;--public class DecimalTests-{- [Theory]- [InlineData(123456, "123,456")]- [InlineData(12345, "12,345")]- [InlineData(-123456, "-123,456")]- [InlineData(-12345, "-12,345")]- [InlineData(long.MinValue, "-9,223,372,036,854,775,808")]- [InlineData(long.MaxValue, "9,223,372,036,854,775,807")]- public void FormatDecimal(long input, string expectedResult)- {- CultureInfo.CurrentCulture = CultureInfo.InvariantCulture;- Decimal.Instance.ToFormattedString(input, true).Should().Be(expectedResult);- }-- [Theory]- [InlineData("-9,223,372,036,854,775,808", long.MinValue)]- [InlineData("9,223,372,036,854,775,807", long.MaxValue)]- public void ParseDecimal(string input, long expectedResult)- {- input = input.Replace(",", string.Empty);- Decimal.Instance.Parse(input).Should().Be(expectedResult);- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Models/NumberBase/HexadecimalTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Models/NumberBase/HexadecimalTests.csdeleted file mode 100644index bad884da4..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Models/NumberBase/HexadecimalTests.cs+++ /dev/null@@ -1,27 +0,0 @@-using DevToys.Tools.Models.NumberBase;--namespace DevToys.UnitTests.Tools.Models.NumberBase;--public class HexadecimalTests-{- [Theory]- [InlineData(3333333333, "C6AE A155")]- [InlineData(33333333, "1FC A055")]- [InlineData(333333, "5 1615")]- [InlineData(33333, "8235")]- [InlineData(long.MinValue, "8000 0000 0000 0000")]- [InlineData(long.MaxValue, "7FFF FFFF FFFF FFFF")]- public void FormatHexadecimal(long input, string expectedResult)- {- Hexadecimal.Instance.ToFormattedString(input, true).Should().Be(expectedResult);- }-- [Theory]- [InlineData("8000 0000 0000 0000", long.MinValue)]- [InlineData("7FFF FFFF FFFF FFFF", long.MaxValue)]- public void ParseHexadecimal(string input, long expectedResult)- {- input = input.Replace(" ", string.Empty);- Hexadecimal.Instance.Parse(input).Should().Be(expectedResult);- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Models/NumberBase/OctalTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Models/NumberBase/OctalTests.csdeleted file mode 100644index c26007d2b..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Models/NumberBase/OctalTests.cs+++ /dev/null@@ -1,25 +0,0 @@-using DevToys.Tools.Models.NumberBase;--namespace DevToys.UnitTests.Tools.Models.NumberBase;--public class OctalTests-{- [Theory]- [InlineData(206121044034, "2 777 561 304 102")]- [InlineData(20612104403, "231 444 740 323")]- [InlineData(long.MinValue, "1 000 000 000 000 000 000 000")]- [InlineData(long.MaxValue, "777 777 777 777 777 777 777")]- public void FormatDecimal(long input, string expectedResult)- {- Octal.Instance.ToFormattedString(input, true).Should().Be(expectedResult);- }-- [Theory]- [InlineData("1 000 000 000 000 000 000 000", long.MinValue)]- [InlineData("777 777 777 777 777 777 777", long.MaxValue)]- public void ParseHexadecimal(string input, long expectedResult)- {- input = input.Replace(" ", string.Empty);- Octal.Instance.Parse(input).Should().Be(expectedResult);- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Models/NumberBase/RFC4648Base16Tests.cs b/src/app/tests/DevToys.UnitTests/Tools/Models/NumberBase/RFC4648Base16Tests.csdeleted file mode 100644index 0cf58e1cb..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Models/NumberBase/RFC4648Base16Tests.cs+++ /dev/null@@ -1,23 +0,0 @@-using DevToys.Tools.Models.NumberBase;--namespace DevToys.UnitTests.Tools.Models.NumberBase;--public class RFC4648Base16Tests-{- [Theory]- [InlineData(ulong.MinValue, "0")]- [InlineData(ulong.MaxValue, "FFFF FFFF FFFF FFFF")]- public void FormatRFC4648Base16(ulong input, string expectedResult)- {- RFC4648Base16.Instance.ToFormattedString(input, true).Should().Be(expectedResult);- }-- [Theory]- [InlineData("0", ulong.MinValue)]- [InlineData("FFFF FFFF FFFF FFFF", ulong.MaxValue)]- public void ParseRFC4648Base16(string input, ulong expectedResult)- {- input = input.Replace(" ", string.Empty);- RFC4648Base16.Instance.Parse(input).Should().Be(expectedResult);- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Models/NumberBase/RFC4648Base32ExtendedHexTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Models/NumberBase/RFC4648Base32ExtendedHexTests.csdeleted file mode 100644index e66c22a34..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Models/NumberBase/RFC4648Base32ExtendedHexTests.cs+++ /dev/null@@ -1,23 +0,0 @@-using DevToys.Tools.Models.NumberBase;--namespace DevToys.UnitTests.Tools.Models.NumberBase;--public class RFC4648Base32ExtendedHexTests-{- [Theory]- [InlineData(ulong.MinValue, "0")]- [InlineData(ulong.MaxValue, "F VVVV VVVV VVVV")]- public void FormatRFC4648Base32ExtendedHex(ulong input, string expectedResult)- {- RFC4648Base32ExtendedHex.Instance.ToFormattedString(input, true).Should().Be(expectedResult);- }-- [Theory]- [InlineData("0", ulong.MinValue)]- [InlineData("F VVVV VVVV VVVV", ulong.MaxValue)]- public void ParseRFC4648Base32ExtendedHex(string input, ulong expectedResult)- {- input = input.Replace(" ", string.Empty);- RFC4648Base32ExtendedHex.Instance.Parse(input).Should().Be(expectedResult);- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Models/NumberBase/RFC4648Base32Tests.cs b/src/app/tests/DevToys.UnitTests/Tools/Models/NumberBase/RFC4648Base32Tests.csdeleted file mode 100644index e04611910..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Models/NumberBase/RFC4648Base32Tests.cs+++ /dev/null@@ -1,23 +0,0 @@-using DevToys.Tools.Models.NumberBase;--namespace DevToys.UnitTests.Tools.Models.NumberBase;--public class RFC4648Base32Tests-{- [Theory]- [InlineData(ulong.MinValue, "A")]- [InlineData(ulong.MaxValue, "P 7777 7777 7777")]- public void FormatRFC4648Base32(ulong input, string expectedResult)- {- RFC4648Base32.Instance.ToFormattedString(input, true).Should().Be(expectedResult);- }-- [Theory]- [InlineData("A", ulong.MinValue)]- [InlineData("P 7777 7777 7777", ulong.MaxValue)]- public void ParseRFC4648Base32(string input, ulong expectedResult)- {- input = input.Replace(" ", string.Empty);- RFC4648Base32.Instance.Parse(input).Should().Be(expectedResult);- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Models/NumberBase/RFC4648Base64Tests.cs b/src/app/tests/DevToys.UnitTests/Tools/Models/NumberBase/RFC4648Base64Tests.csdeleted file mode 100644index 1e87c4887..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Models/NumberBase/RFC4648Base64Tests.cs+++ /dev/null@@ -1,23 +0,0 @@-using DevToys.Tools.Models.NumberBase;--namespace DevToys.UnitTests.Tools.Models.NumberBase;--public class RFC4648Base64Tests-{- [Theory]- [InlineData(ulong.MinValue, "A")]- [InlineData(ulong.MaxValue, "P// //// ////")]- public void FormatRFC4648Base64(ulong input, string expectedResult)- {- RFC4648Base64.Instance.ToFormattedString(input, true).Should().Be(expectedResult);- }-- [Theory]- [InlineData("A", ulong.MinValue)]- [InlineData("P// //// ////", ulong.MaxValue)]- public void ParseRFC4648Base64(string input, ulong expectedResult)- {- input = input.Replace(" ", string.Empty);- RFC4648Base64.Instance.Parse(input).Should().Be(expectedResult);- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Models/NumberBase/RFC4648Base64UrlEncodeTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Models/NumberBase/RFC4648Base64UrlEncodeTests.csdeleted file mode 100644index 4136333b2..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Models/NumberBase/RFC4648Base64UrlEncodeTests.cs+++ /dev/null@@ -1,23 +0,0 @@-using DevToys.Tools.Models.NumberBase;--namespace DevToys.UnitTests.Tools.Models.NumberBase;--public class RFC4648Base64UrlEncodeTests-{- [Theory]- [InlineData(ulong.MinValue, "A")]- [InlineData(ulong.MaxValue, "P__ ____ ____")]- public void FormatRFC4648Base64UrlEncode(ulong input, string expectedResult)- {- RFC4648Base64UrlEncode.Instance.ToFormattedString(input, true).Should().Be(expectedResult);- }-- [Theory]- [InlineData("A", ulong.MinValue)]- [InlineData("P__ ____ ____", ulong.MaxValue)]- public void ParseRFC4648Base64UrlEncode(string input, ulong expectedResult)- {- input = input.Replace(" ", string.Empty);- RFC4648Base64UrlEncode.Instance.Parse(input).Should().Be(expectedResult);- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/SmartDetection/EscapedCharacterDetectorTests.cs b/src/app/tests/DevToys.UnitTests/Tools/SmartDetection/EscapedCharacterDetectorTests.csdeleted file mode 100644index 298d7e9f2..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/SmartDetection/EscapedCharacterDetectorTests.cs+++ /dev/null@@ -1,36 +0,0 @@-using System.Diagnostics.CodeAnalysis;-using System.Threading.Tasks;-using DevToys.Tools.SmartDetection;-using Microsoft.Extensions.Logging;--namespace DevToys.UnitTests.Tools.SmartDetection;--public class EscapedCharacterDetectorTests-{- [Theory]- [InlineData(null, false)]- [InlineData("", false)]- [InlineData(" ", false)]- [InlineData("hello world", false)]- [InlineData("hello\rworld", false)]- [InlineData("hello\\rworld", true)]- [InlineData("hello\\nworld", true)]- [InlineData("hello\\\\world", true)]- [InlineData("hello\\\"world", true)]- [InlineData("hello\\tworld", true)]- [InlineData("hello\\fworld", true)]- [InlineData("hello\\bworld", true)]- public async Task TryDetectDataAsync(string input, bool expectedResult)- {- LoggingExtensions.LoggerFactory ??= LoggerFactory.Create(builder => { });-- DataDetectionResult dataDetectionResult = new(false, input);- EscapedCharactersDetector detector = new();- DataDetectionResult result = await detector.TryDetectDataAsync(- input,- dataDetectionResult,- default);-- result.Success.Should().Be(expectedResult);- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/SmartDetection/YamlDataTypeDetectorTests.cs b/src/app/tests/DevToys.UnitTests/Tools/SmartDetection/YamlDataTypeDetectorTests.csdeleted file mode 100644index b921cb6bb..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/SmartDetection/YamlDataTypeDetectorTests.cs+++ /dev/null@@ -1,31 +0,0 @@-using System.Diagnostics.CodeAnalysis;-using System.Threading.Tasks;-using DevToys.Tools.SmartDetection;-using Microsoft.Extensions.Logging;--namespace DevToys.UnitTests.Tools.SmartDetection;--public class YamlDataTypeDetectorTests-{- [Theory]- [InlineData(null, false)]- [InlineData("", false)]- [InlineData(" ", false)]- [InlineData("{ \"title\": \"example glossary\" }", false)]- [InlineData("[ \"title\", \"example glossary\" ]", false)]- [InlineData("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.", false)]- [InlineData("foo :\n bar :\n - boo: 1\n - rab: 2\n - plop: 3", true)]- public async Task TryDetectDataAsync(string input, bool expectedResult)- {- LoggingExtensions.LoggerFactory ??= LoggerFactory.Create(builder => { });-- DataDetectionResult dataDetectionResult = new(false, input);- YamlDataTypeDetector sut = new();- DataDetectionResult result = await sut.TryDetectDataAsync(- input,- dataDetectionResult,- default);-- result.Success.Should().Be(expectedResult);- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/Base64ImageEncoderDecoder/PNG_transparency_demonstration_1.png b/src/app/tests/DevToys.UnitTests/Tools/TestData/Base64ImageEncoderDecoder/PNG_transparency_demonstration_1.pngdeleted file mode 100644index 80fb97292..000000000Binary files a/src/app/tests/DevToys.UnitTests/Tools/TestData/Base64ImageEncoderDecoder/PNG_transparency_demonstration_1.png and /dev/null differdiff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/Base64ImageEncoderDecoder/Png_transparency_demonstration_1_base64.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/Base64ImageEncoderDecoder/Png_transparency_demonstration_1_base64.txtdeleted file mode 100644index 81d98edf4..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/Base64ImageEncoderDecoder/Png_transparency_demonstration_1_base64.txt+++ /dev/null@@ -1 +0,0 @@-data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAyAAAAJYCAYAAACadoJwAAN2PElEQVR4AezGBaGGABgDQNxK04cSFKDT0ALP5b/7ZCveAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIOV5Sarn6nlOtywZjmyPHJ8+HTkmqY/sj+u2LdO6pi8eSdokdQEA8M3KAvhVdnbOIliSY0vT/znuHphwUSUaZj3rVTMzroaqh3mambmlO8xMzfunfW/HZL0aZsYmPZP0uqouZoTDOeOekWmlYW70r+yz/8SJyKJV/eWZWUpEDnr6FCZna4x3xpCNESwCw0wGmTJnGRljQECiEHIuaNuCNxvweg03juB8jSwRAU0DiECYTSBSv9thzhlVdX73XYS339b0H/9j5z/wAaR/9s8gV1eIACl+blKpVCqVSqUWkEqlUk4vrq7If8/36IUx3qZExlq0MZKLMbmUYFVhVIlzFm1KS9EoOyzwsltgXmbnwMMAs92icY5s34PyzjonbO3xWRVVhJQQvWc/zxpCgL+5UT9N8CGYSKTCDFFVD1g4hyCiEdC5aVTGsZseP4YngvysKSiVSqVSqVRqAalUKsof/CCaD31oaseRB+/JOkedKtw0pUYEVrUUDxhVcSmVBC8Fg4xIYoBYBGBGSSoy73NPTmYGmgZmHMWuVtTk2bYtbNlZC84SswIoIqaEGCNiCOS9xzxNGnY7+N1OfYwcAUiRqCSLMVBrkYg0tS2CCEdVeFXxTWPupknCkye9z8VqQqVSqVQqlUotIJXKTydPm4/8SOo+8iNNd3rKzcWF9ETciaBhto5ImhixLxsAbEpqRcBZc5BVJScxUOZFERCR7FOVaLlXdiDnwH0PN45wbattKR5dB2st2BgiY4SJoKrQpYBoDAHl9MOHwJP3Gg9FJO84ATiUEBZmVWuRE4lIyz4Zo3lGJOKZSIMIzymJZzbTNJkdkDwwTPUtXEcqlUqlUqkY/D+iUqkoAV/bAN82At+8eu21ePrLf3k62WzkzFo5SUlPQsA2JV7Ps27mGat8PZb0XkfvMWQPO81ZLPeKus4enlv2i7o3JV0BunZOT5j1jFlOAN2qYiuCdUq6ya5jxDoE3XgvwzTpmB12O+mmCf1up/nXlS7n8PCA3nsdvN/nmJKMMWoW/TxrF0LqU0KX5zYEbcopTtl5L12M0ovIYK2MxmAcxzR85mf67hM/8bvcV3zFH8Gbb76RgCv8wqRSqVQqlQrj/5JKpXLTAU/XwIcvgOnRdnv3wosv3r14fu5f6Pv4Ygjhcp7To91OLx4e5Oz+Xs6nKZ3uduns9lbOcwE4v7/Xy7x/IXuZn7ksz+a5PH8xTfvr87LLz17m67LLczbv5lnPQ9AXVOXFGPWlbP418SjvHnkvj+ZZHuXnX5gmzb+H9EL5OR8e9LJYfo38a79wd5cuy/7uTi/v7sr9spM86wvl1yy/t+LtbcoZXszzo5ubkK+LMd9P5efIv8d0Xv6Mu13MczjPz17e3k4vpRRf6Xv/i95+++4Xf8/3PLzyQz80neF/lUqlUqlUKvUEpFKpPG2Ab+mBr98A83q79Senp37btvOmbcP6lVd0e3FBJ87p2jnaALxKCaMIViHQ4RSCVjFidTgByTuM5TrfWy+nDlhl8476lGQU0SFf96oYyq6kiAxEWFmLtTHYZFfMmsUa0BWAsSiiq+X1ml+LLgS03qubJjTTpE25Ps7zvMzeo4tRh+yYkpTXtnnOOxm832dfstwLIXV57mNM/XFfnhVBTmlSKnPqiWRQTStj4vq3/bbv2v6+3/cd3Vd+5Xfx93//H4lXV1eCSqVSqVQqtYBUKpUjaoFvbLMbIGxOT8P25Zf9yauvxpPtNm6HIW42m7Q+OZH1ZoN102DlHK1Veb0UD+TSgU1KWua9y9ui9Fg0Dv/QR/ZYMHQ4FImVKlZEusm5AXStquucG2bdEukJM7YANnneqpbnyjMoxaP8+qPI8haqELTLlpJRikLrfSkb1M6z5kTek8tz3mu3FAftyutSkj7GspP9649zzmJ7nEOQvrzucL8Xkc576VS1LTJjAHQgkn1ZUpXNe+9J/43f+J30V/7KH/G5iCgqlUqlUqnUAlKp/MIuHl87vvrq3da5eXt+Pm1/xa8IJy+9FE8fPQqnTRPXw5A2xqTRuTQy68oYrI6FoJSMlLAW2Z945JmKq+wQI+1PNRZ1FEHeY6Wq2yKAkqfZE1WU3IqUHdYlmZfiQYRNnkciXQE0AjoAyOqoqisRDM+LA7pSNLwvpx10OP3Q7D6b3Q5dnvuldGCIUXJqFt1SQvaZLbu0P+EQkTaE4x5NjEtxOeQgIj2gvery+2CWjkh6kZTvaR9jOUXR9Tvv+M3Xfu3r5su//A+nv/bXriIqlcrPLxSEq5x/E4yvg8XXZL8I/NqXvtZ/wVd/QfdZX/Oxw2/9xt+9+l1f/7vWX/JNX3L6B77xD5x8+bd/+faLvuWLtl/+zV+++pLv+JLNF33bF62/+Lu+mL/6W77afNq3f5p77Y+9pm9dvSX4uU+lUgtIpVK5bl977ds31t6fnJ+HbdvG9dmZ35yf68lmE7fOyTql5S1FImmVUlp5n1aqujZGt6rI0qjKa1UcS0i+pl6Ex3KdXcWo6+wmz/sPqgPYHmXWDRHWAEYiHZjRZdu874zR1loUm0XKOzRFZm2Zc2aJYAEYETKqsDEqhwAKgTjPZp6xd5rUldztYGJEI4JSMoqtSCkkx5ONY/nQ9lBE9opIEyNy7p/PSpnzvSVVZQRkINJ96Sj7bLO8RSu185zaMufM90L31V/9XekzPuOPpjffvBL83KNSqZSS8QYMvhQOX4EGvxsdfiL7BzHAYoTHkO23YbtaBYwa3cp6u5pCWE9h2tzMN+s5zic3083Jnb/bXqfr09v59uR2ut0+m56dvBPeOfHBr3GH/iO+8SO6X/WNv8rZb7LmV3/VrzY/+jt/VPBtYPxFKCqVys86LCqVyvtQAm5z8UAPhAFI/fl5akVSb23s12vp2xat6vI//UDqQkit9+J2u+SsLcWA8k47ZuQ9tapoRUxjDDdEui8FgLYAGlW1Oa0xZIngcpafwzCDjQERgYm0JEoio6rEXK5BxoCZaZ/GaBZ0yCzx4TWkqlCFxqgpRooxQosh7EUImoV4DxUhEhGDPVq0miHSArLlCS0JIAEiRAiARgCembII2Vg0hqIIIkBRFanMxZTgY8Qco95PEz10HXW3t9T2venG0TTWctd104d/+Idvnn3+5693RCSoVCo/e/m7YFgYxH1a+Ox7MPukss8iq+Bin+dee27NYBQjxxCtt2imMNlrvjYTT+bO3tmGG5N/kCNHZIiYOApEQQgTTf4pnvbXuJ5/HO95B+ef0bP4CSefEIXF3/zoTbg0l+mtV96aQFBUKpVaQCqVnz2oefz4vv0H/+C2e+EFDCGE/QeqU0qdamrbVjpj0BGhD0FaQHMu/2NPVO5Ju9mg6zodiZCv0QDaqEojgjYl7ojEMYszRnPCEhFbC1PmksaAj+XjIBGBypyzQICi7IjeX0J0/2zRmJLKxlBGUdCMCImISghIKUFiRAphuT4YS8ZISUSOxYOOrweERJYSA6jRMixYVcmBlkgVoEQkkYiiMfDZoAoBKDBDiCCq8CIaUtIQo84h6KptdTdNuLWWro0ha4ylvreOWVjVt2+8EZ588IPvPXzhF156VCqVnzU8/g+P7bvyrnkvvGee3j1t/IO3wmLjFO1tvDUgGKQssjHLYKQsg0VaJrLGJWd6OEtMbpJ7q1AbbTANt+YhPJjOdqbllg0ZWGMhJAKFKGuKiH6nu+4GNzul3RwQQmvbBIJs84+X7Etxxav4ZT/5ZXF4d5hXdhVg4bFGuKKriEqlUgtIpfLTj9KnfurD0Pe37Y/+KMbT09CJoBfxA4CWObXAUjKYpfc+9c7JkPf96amuuk7za2nNjLzXEUCniiYlaWNE4z3ZEMjEmDhGoyLIEDMTOQdjLWyWjYExRrN0KBPKRMdUOoiFsgOKh2epJNExAVVkKKdCBJIt5UJSKkoKgdLhxCOGoGmeUXZRRPRYPlRxmAW6UGZaBsXhMOSwB6kWlQBYypMIBqJjgdkXn0SEqKpBFT5GmeZZZud0ahqdnKN2efsYHJCYKBlrhaw1pu/V/bN/Rjevv/7hJ1dX5x4gRaVS+WlHVfnNH3/T/Ah+xM33s7u/vXfwsGfprOHI5jpc2w/rh6mTzrWpNTNmPhQQhmSXQsJOYYTEBCV7R3fGsLFS1pzcmsVpVOfMzB13VpJYIbGOHTx7ZWIFIQokevI+Ifm8u4fiwVIXNYYAg8TM0qVOGmm0dW3qQhf71MeNbOb56Tz/2ad/9iEXl+nq9GpCpVL5aYVQqfyCROnx47vu3XcxhKClVPTzHHvm5WtkRbRdTi+kE0kds3Z9n1abjY4nJ3o6jrpuW1k5t3dglgHQ8mybEjVZV4qH90bm2WoIVrzP6+QSkSNrLTlHbjn1IHM8+TiWj4PP34KVBfaiWGBGodxDcblYPMwqAk2pJKUYITklhCJijJq8p+A9UjakdCwWSxZU5bg7FpHjtWRRLJTx8GsS0ZLWqtn/MZ2Yw+mMMGvMBiLxOXfMaWKWnTF055zeG4MsXRMha5+mZK5V3Y21zZ217q5pKNvfANPd1dVLAZVK5aeF1/V1g/+I5s7ftTHE5kl44mSW5qfST7lbuTW36dY+C8/4QR+Mito5zTzrbKCwTp3x4o0jZ40aa9UaQ8Y2YNthZQcMTb7HHXWuIWsctbajxjhuzWhGN/LYNKYxliwZNmpgoKQpUfIRMXj4OReJ+7fx9l3OiS3Hllrp3BjXZkijHXVlV2lt15Ln1NgmrNwqWLKzdfY+UHhw5B7eXr/t/7+cilQqlVpAKpXHj2/721vtb25K8dDhWDyI0KdUCoQcPki9fFtT38t4fo5tKR6bjZ70va6bBmPTyMqYUj60V02diDhVcSKglAghsIZgZJpMmmebSgEJwUlKhpgdO8dmeevVUj5yUklmPQgC5HDaIYQ9AlUUFVAQKZU5py67wvNMqbgUjxiXElIMgUK59n6/y2p6f/l4/uu8//o5y7NFKA4cy5O1MEupQtEaoxZQVs0uREAic/JEMqnKvTF6S4Rba3HLrPcAXTPzdUrmaYzuWfZmGOyu783dOLq7eW5usrff+73bHf6/UalUXv/Xr5sbdzPGOTbzw9zOcXYCaX3wzU24sfmtV3wt1ybF5BKlffkgkDNqnE22sbCNgXGNWue0LbMtOwIxKTkGW0PGADA5mYkNg4xlQ5Ya03PvGnbGkjMm7zKipEkgUSEpcPSzztMOu+kJPbnL3itrbLiX0XZpMEPKZSN1toujHWVwQyxz3oeGmuism7I7R26e3HQLg4cn8xN/dXY14/+eSqVSvwWrUlH7eZ/3bdvr67gGdBNj3ACyZk5rkTSGIGNKshKREdB118n2xRdx+eqr+tKjR3jp4oJfOj3lF9ZruhhHnA8DnXUdTtoWq2zftuS6jm3bMretgXNExjAWTZk5a6xluyRZ55DzucZoTs25FJFjHiVCVos4FgaRvbLMBdWUVGNUyaai95pCUDmedoRQUiVnTAnyvGjo8dSDlp0crgHdI1lkjuXj+WlH08C1LWXRdB01+Tqr1lraFyxADQAroi7bpCRtSvu0MaqLUUyMMHnH3it5D54mULkOQfj+XjHPKPcMs5p5Vv6UT/lm/O2//ac9KpXK/zsU9Pg3PHa/+Gt/cf/ew3ur69vr8dn9s9WNv+kf/MPqdrod3/HvdPfhvkPE0Em32mK7OUtnJxdycXYpl+eXcnFxQZfnp3J6dqZn5xvdXqwwno3ZHv1J9rRFe9Jrv23QbPK8durWFnbj1K4smnUDtzGwa1azhmKEap9UuiixCxJar6GZ09z45EvaKU3uLt2ZJKlhRUtCPSsXO1LqVbXJtgxuBeKKCclJkv01JeobbboRo/uMb/0M+/Hf+vF460++FfG/T6VSqScglYraj/zIaTg7k2G38z0RBtU4hJB6ZnQppRaQXkQ6VW2bRsf1Wte5dJyfn9PZaoXTYcCm67BuWwzW6mAMWmPUMqvJEpGCWQhQiCiWf+yTPDyQ7nacsphnJ/Ns4b2FiGFme/zgeL5QPiaR0uKxaAg/LxvIHoGoLteqiuP1sivr4wkIpVI4SsZ4PAnh/bUIKRH2HAsHoO+fD9cQVYEeb+H4GRRl52APbyOzzi3JDD4UDwKIRBQiQjEKZ7GYkJKI6vJ2LGNwn/MO0BtVPIsRT73nZ4C5IeJrwN6KmOuuM/eqze1qZR+axt1NE27efHO6BX5ZRKVS+T/nn4JhYLGDezQ/as/lvMv2D+mh6VPfGzVNiMGVdOLahpq+Ta4nNT0rt3nfkVKb5w6qDYgcFA1pTsAQyCqpIYVTwEJhFJIFA2oBYiUlysnEbNkaS9aafEVgVdIkJEkgKSGFvZpmT95POu1ucHN3QzcPMwXfGFtOPVLHnfauT73ty3XMpr7pQ8utb207N67xFtY74yYHN5dky/NAw06dPpSf8w53D29s3/D/G9/EV6lU6ofQK/VzHncjgJX3YUgp9UAaiNAtb5taMiXpVdH0vWxefhlnFxc4Pzmh8/Wa1n1Pm77Hqmmod64UD3I52VplYxRZKgkIqSakJJhnod2OiBlKpJTB8fiASBAjk6qQtXQ45YAx5lA6FkEkfDiJQFYO5SOlJDk1D5BMTi3XKZsTh+dUshoj5SQ5FBBJiQ/lQxJAIGIsCI5v6SrJnOhwjQVhvI/DB+SPJcNYC85aY5SNoazmHTEzWFURo2pKBFVWEWQ0S3tVyaUEYlaX5xZAI1LUsjchiFFVa602QLLPnllLpPzwoCZG5aax9OqrA37iJ965Ax4F/O9RqVQUhH+DBk/hIGi2cdsOMnRTmLprve6b1LSTTu5ET4aNbsopweDE9QQajZqehFpWGghoAW5VtYHCAVnVfdkoO4Waw3/0GJQZaqEwoOxSQggE1kMKhIWECURA0jyLQKJCY0KKEdHn9FHizsM/BA1tpNglDlMUJK9ejDFiYISEEiklKCIIUY2GhDRHjbNlOznZl4+ZhScjZvbGD01shsEO40jj7k/d/Kn7169fv7vaXu1QqVRqAalU/tto+3mfdzv+5E9iYNaBKA6qKc8ypKRtnntV2RcPAL0x0q/X2Dx6pOcvvUQvbDZ8Mo60HkezHgYaSvFwjmyW2xYmJ1mrxHxUACSSHN4LiEjKnNUQQDGKNg3zclhByImcdHgrFj0/SXl+AqKqEFGoLmUjxhxpP2eXwpGS5P1+l6eSe1VEjqcfsoiUEu9PQlRJmYEiINnjCU5es+Q57Xd5LjsC5FBGkBM5Cc+/QpgPBep54cj7vCOT95RhESgyqnmCChGyvN/kWQHKKsdYSgbG5e8CjgjGWnUAWu/hpkksoFYVRkRtjMrMwk+eCD16JJwSmw996MktcDajUvlfp554/G00mLKEZvRjZ9R0IYb+FKe9Vdvk4jFusV05daV4lNIx0LF8KDpV9FC0CnXZFgqnqk2S1AJoyiwqyz3AZg2ULBMZAKSqBCJChhVlBoOJlWm/UoESVERUkJJAY0RMSVOMGn3QsMveTTK5iacmcZqUVVhZZpkTgVKZmTiBEOAR1WmIiKG8vuFmihQmn+xUZiNmSinN0cTOJjs466ZRx/GMztZ/8eYv3j3hJw8YMR0+sF6pVGoBqVSUP/VTdyPwsH72THrmOIhgXz4A6UVSC6BXlVI6xmxPhP70VM5eeokvz8/5LJeP03Gkcb3mVd9z27bs2pa4acjkJOdA1haVltIgBChJjpQAItaUhGJUEyOJtarOISsIgWAMKfNSQJjpePrBx/IBKEQki5TdZ0oqMSKrx1kOWa7TUkJEDqki0OUe8oJSTFzmBCisTaTKRSy/HpRZjDGJczKRwBjh4lJOFp+XDxBzkY0xmoPyQJSTjIE5lo98nbdASrpHhNQYpRhBRCpErKqURLTsYQyOJafJkrViiNAQSaMqLUDNNIkRAYuoeXhQxKiUktJuJwQ0dHl5Z9577ydvgFd2qFQq/6Py0cDDYUaLgCbb9bHvTnAyvIJXhnM6HwcZxh79ysENJDSQ0sDKg1EzQtFDpReghWgrkFaPqdKJagMUKQtriA1AWTAIRFnkwMLhEhnN0rKghTIoVEEQAEY1WQYngaR9uRFxKtr45M1EUyNGPBmKEVGMmhQpplnntC8gQCBQzBkVGlTVJ0qztXYyaqagYWqkmZi55M6ynaLEPpjQT2aautj1l+5ySlO6+56b77mt35yFSqV+CL1Sv93q8tJvnZOtSNgwxy2RbIjiWkRXRGlkls0wyOlqlc66TrJ6en4uL738Mr9yeUkvbrfmYr3m0+3Wrtdr069Wxg2DMTnNOLIZBua+N1nipZRgr7WLzCBVJRFFjKreQ1MiyjMtJyGELKmCiXAoH/sk4Fg+VJfycTz5QFrUkuK97ucQ9oZ5ljTPmqZJYtHPGueD3lOYPceUSABQBsz7KKKkMcKLyeQka8Vky2ydSy7PdlGzZVdSnXMoaaxFsexz0kHe74lwQFVEIQKkBA1BJZtipLicyDCsNTCGkWcCmFXJEqEBYJn3swXA3kMfHkhFlEMAea/IiXmmIq3XZHa7b1bgT0fgCpVK5X38B1j8LnS4RQ+PARNGBAzbsF39Ov51Zx/gD1y+hJfON7I5W2N90Wl37sSdW7VnRVY+J6XT7FYFWT2JGk8kyWnStE2StiKyUegA0MjErSHTMpvGknXH7+HIc0kuc5aNMbz8yPNyRWV/2BITkyFD7+dQUyAqEhGllIxrufZJk2Fwd/i1OwJ1RHubPLfAcloDghOIU9WjTZLUJE1ORFzJhGTzzmUNKeXr5b5V2yq0O9mduM/+7s+mj/2jH5veunpLUalUagH5hUT9kPm3rh4e4qkxshaJ65TSRjWVHFKSlXNaisfJei1nfa9nbZsunJPz9VofXVzwy2dndJnLx9l6zetcPobNxjSrleXVal86zDgaHoZSPP4Te38BLUmWpGmCv8hVVcNH7h6YWNBVXQ1DObCcs8y8ucxQvTzTMAx1aqG5l5nh4Cwzb08twzDUnKltqqruysrMIKdnZqr3yr8iV/WeZ8dPRFRERmQl2a/5u1xVM3tPn7mfSPueXBHRAI+0wIe4U2REUqKQRCkBHpHpIA8H8nRCrBHxeEQASQWQUmYWOIOBttWK7pLzA3wsMbyABxwsmCMGfAR0+Pcaj0dOxwPqXI8813u4xQDBnJ2QEM4mrLftYxpOiQ0+Knj0vVV3XQnQ8Fif06VkS7euBwBJCR6lc/tatPXTbABSCizcwCkgqnXjItUCPGYL2j0CImSFmF5VFhBBLyJaCmUc4z2tUCP+82POIkGmSQNC9HA4mkPIhFkXXXQBj38PVvgAW4zYYKpxv7LVzrtWXX1Nv/bkq/rV13Zl99ivPVpx9bhD9yhZeiwmAR53IMK37oCMO6PdZsu3AR2FZW+0DcA1IL0oOpWUVLWhhYTjaIAxJ0/PHn31kBlLVDTWHkR0OaogMBht/tMKi73Ey9OIscTXdvcKHURkNmTV1hAMBAfAo8zwYbCOxgYfQ0SjzdfBgJCOnB+PcxBDPJ6YhguI/FjpoguAXHSZYv437d56a3K4GG9S4t4sX0/TDB+k7bvOvIjcbm9u7NFuVx6v1+W1vrfXUuLj1YpP7u7wxs1NbLtKDifJJ6F3K193S8bDoaPzWMGjW68j6xHGkvmQCh7ADB4BHQ4Dbtr9fYBBgIdxho94DAiPI2AGEYHCAwCZMx5SSrGlXgNLbOAhucGHny9TzK2MI8I54CPWxcSwfNkADrd2nTvBLaoNQlTOJ6ljLh43hykuwGFnLl1KDKfFyzla5y5dAGSJurTdBczaEEQEeCxT15kXT/FziWDpMywuhUcs0KQRSVmyIbIACIY5uxIQQjudZggpBQj7Y37dHELoEPIHAfypyIQQP6666FJg/m/ECt/CBrlCR3jn66vBht1rfO3qr5K/6o3X8fprDh6PHTzuevaPE9NjGu9gqKARwEHjjbuuzUqAx3Vh2RJcQdCLSHJrHAqV+X/zESAR6nzV1T9rTDUGaEjXEOXMWt0yICFtOVwBCLJlQAqKmZjFxXvcT0Zjwow1uvynSURq1gNAQEi3AEjvsaO4yTkjAo+0rq7JgcYhM9fH4ro7FZYKJAuIdFBEr62hy1331/0df5380h/+pREXXXTRBUAu+lET0+/6XcfrYcjXKU3XAK9irgc5XYnYHrBd1+W63cqzHo8dQhp4vNZ19sjjo+0WT6LeI2o9PPuxur3tes9+aMBHy3rEtqvIergl6j+GQXSe7wEXkTMxjmSAxuFgDh501+jnxQ4Hxhr396Cv3cKcIaS4qGSFD5ZCd8RWMC4t+7G0zo3IFtm2MeUc0EICggCCvm8ZiAf4iKhJ23kIQOt1yaXeg2mOltp5uG29egCNNqMkTF3WaYYRdTf4EL4CH1Pc/ziyZWuqSVhKgrkQXw1oBeuCJnGREEC65YNDLVKPrIwqdRwDxrhsKZthsOuSTBMwZ0JO+ccyE3LRRf8QevwlrPAMW9BdsMMJewePfSpp+zpfv/7L9S9/4xEfvebg8aiz7lapj913VuwRC28DPmCI2HxH8qrQNss2Jq12iUizyAIfLRmqegYiM2CkJQPii7rWc7fXtFfVr+cHBOEQKYTBzM2IhYUQkEYeccwigk669lXaH53HTiAVmqqBltGIdQWMmvUgh8LSLeuaDSlWzweSaQGRuNabWRdQsrFNvy3b4V/8d/yLu7/mb/1r7Jf+6GWOyEUXXQDkoh8Jff3rLz3rMd5cX48BGwEf16rTdSk5wGNvVq6GwW6uropvqbInw1CedJ05eJQnKdktYI/6nl5orjcOHpvbW+0dPrrIfMx1HikgRD1W+FivVYchXGsdBK5STBw64Lbj0RAZj5cvzQJCXr4k/dzN8uIF6ef24gUqhJxOAS0LAZDuOG+DA8OweY3yACS0BT58jZCUQsTjAEUEkhQamYcHAFFtvyv0tXgMIyIgbYggRShL9uMsm9GyHS2Gzd3qVVr2Q1RE0gIeorOElOW+pQLUNKHCxzTVOpXJ36OTvyduO5rNAKIq7X6wvC01ApBwKAIJBdAv27Hi/mLgYSJpDjSNVwKqIMI6jX6/Z3c8/u0E/tiPRybkoov+NBT/AQywgI4FPDL2q7wK8NixcHNlV1c/Jz/3+mM+fn1t68fJ0p1QHmnRx2YVMiLjceuuGRCCNyT3ADbuXl0eZQEOQkBBrGdDUFevnEds51DRWMefkFmQZpWqiKq6PEhAwAYfrUm5wVj8CCUkjenpG2y6AYPe6s36Ot0MG1mnjWy6OXkiijgELSsyZzrAiA0wOnciPBr7AJFYB4S4Azha/UjymOK1mbnLyB0EXbI03Old96/5u/81+Cv+k39FbMsy/DDqoosuAHLRRVSv9bgWmW6GIUDDrudaj/HK4wIfdrVeF4eP/Hi3Y0BHdUp8IsI7ko883m63ElmPwTMgXm2eUni3i0zHDB+7Xav30GWrVQMPBnjEVisLHw4BG6XMGY+AD/N1xAof9uyZlefP6eewAJB5+5VV+AAopRiW2giGp8lsmuZ1KVhiPIcwYwOXWC9blJY6jhSZmRkEuk5VRBBqEFL5YM6KQAQNQGKFpf4jqUI8LpkNSx7DKmJuhEWE7lioNC5QTXEOQEHO4GGGMtetSJ6mWNetUgEfk78/p/feKy/9/TkuUFVIItwUpzNwCJf7hccFQphEZADYqUpkafphkCRSa25IGsyUKdVnwx9zWzoeJ3MImX6kC9MvuujvQw/FBsQOk3vEbjWtrlJOexq3zNyuy/rqp/BTT97gG69H5iNZCj9m4eO65cqsgUf4BsReRNYq2i8ZDUJwDhOkUOBqWQmCdJeCUtcADCEBCAo4Q4S0L9IYpUlwDjMNSNpjOAMQLF+fCg34SFd+PElP1o+7x+vXutdXj/vHq5t0O2zTtlvpKorfpaCQQi5clNxdBRBhD6BmPBYgSe4ORG+csyL1cTDOY93T5ueBqKAiJhVclFrBJh1T/7/7Y/+7F7jooot+2ADkoos4/FP+KS98Irldp5RrrYdZwIddkfkq4EMkCs2Lz+8oT9Zre73r5syHqlXoAHinCs+OcHV1pWm/l6XOI7klMh1hcTfwQNeJC2JGjGMDjxKw4S6csx7kAh5umgOHQ4eVZ89Ynj6NdcAIGJBiRiWpZhU+3JSciZzR4KNlQThDRwWUZU1xYyleT6oRZyhJFUBEl/oLmbMHyq6r11PXVzCRuTgcVaTRVZczgFBVoUsxt5vnvTFtZh91C9rXBwRsP5IJS233y2XoIRw+JMd5bL2aAaSM/n4cIgOy1L5YAIqDQzEjG3yIMKIt5y5pENIgrGVCetXaCKBbrdClVOEtJCJKuHKuEMLVSuTgN/AjuR3root+BQn/Pqxxjy0wZzwCNNKUdiQ3FT4Kt6mk/Vt86/ZL/NIbG26eJEtP1DQKzZ+A81YrkrcBIQEeCt0kTZ3O9Rjiggc02PDDDMZ2ZOZSWKp9nT1agxCD0SNcc5SGE2DEpriy/NHcQCSOENsrG4IIgpDWstNdOF31V+muv+uu++vO193Oj023qYAy6FBrTAjSxNrXVwDhWhvStlm5K5REBNErtBfKKpyYVmIy1EJ3yODrLjGlpV4kEUzFSt9L3/1r//Z/7e5f8Lf9C35YtmVddNEFQC66yKeZb197LXvL3HzVOlxF9gMo+4CPnAM+aubjbrPJTzabyHrYOXyEHVy4ia5O6zW6qPHYbKorePS9oO9VhiHJPGRQkZK2LVKcsx0WcanxKG7GNd9eZcXtcYaPDz5gfvoUbuZnz1DC8ZqADdISSS3F1Kxa5s5ZhdNEN/gAH7EGwuScNRGZMxMBDCKUud4irmOBB5GljS0FwhQAUuEjLtPdit9BEiiF1uZzLK2AIa6ISwYiYjWpHhtsiJHCiM0BHx4X+JCcc6v/QO14Fd26/D06eVbo2NoBt3JSEpimuVB9SYYIZvEBQogGIeElI9SLhGcIWa+l63sGaLHrZhAjYTkrHECwXkO8MD3XwvSLLvpRmunxbGmra+6MXWy3YubOHeCxi2spp93Odtdfti+/scf+9c6WLleURxU+zBp4XKnoqtOub8Xiaakvh0IAyAIUNcNRmC2zWN1taTmPHMtkY56Qy8TJSNqSFUGsKSRcC4QQi+T8cL0KIOE4ziGkZVF66eFwgXVay77fqzvtu33adlsN8Nj1u+Qx+eM6LIe/JhkMRQopfGXLJ9JSkD6A6ATSIGOVkIZEt0elrhbH8wYAg1A6j52ZdQYLIElxLUnqrnmtX/s7v0YvUs8/kMnYiy66AMhFF7H7xjf+tuv33893ItMVyX3O+aaUGT7M7MrXO9Vy5dDxKMBjtYpC8yg4Lw4fFTxuVLHrOgx9j9T3TMPQulkJVquAD0XXiVul69C2LYEURtbjdKrwEaaDR2Q+PMa2qhKZDnepEBIZj/fftwCP6f33kR1EJneO7EjOTGYWVtJSKTlizYJMU4nsSmxRMo/LJHO05ISSFg7w6FStE2FaMhRxXYBYh2ZoarUecT6DFORs1ghcXD7M0wUzGFwi1YqqVoch5sbMShUwwpyBIwxboKPxVMQyw0cDEMnjaMXfvzG2XZmBrSZFXG2tClmK63PONBHI4pAsmZGIWKpUF5hi57FfAKzbbKQbBkhAVd+D4yhG1kxL3Y4VwHk4/CFzCJlw0UU/ClmPD7BZsh7h/ZCHgI8AkYCP8C5qP5Klq7fKW6/d2M0b0WZXTR8JpRad0/iI4FVC2vTaDwEdi1VFtWUfjMaa4YA7oMOmMjHbyDGPNuaTnfKRx+loxynW8RyjkaiHueuCIDFL3BCJ8Or8QeAVc3mOEGS1ECqKla7CEtCxSzsJ8Kjut6kByKZ3AFEHkK7ChySpcKUEOWI0oHGPNAiJxzoQK4X24URdiWkASEBHL5CIg7DCSTiuxWtqpLFbvk4yswRBd1Wuhn/F+K/A1/7o1/IPVG3IRRddAOSii7j6p/xTXt7d348BHHvArqdpuiHLFVB2kfUwsz1Zrtdre7zd5gofXWeP3Qt84LrruO579O6u79mmdGvXiURheSuAdkusAaUICAhzjqLxwuOxdbgqbjLA48WLBh9mbocOy++/zwof777L8Td/k8ff+A3cH490WQKsI0syq14yH6Y5Z0xThZxwg49zGND59ayZD5FwnJsCdEOWtEQDDwkIaamOlFrGAw04bInt6zfYafshanyAD62PzdurUGZLjTlHrLYZTNTXmt3t8RyO7VfLsMQxQGS+L6lSDaMamOM8PX0euDjDxvkAxda6uF2vUgCtTa+Guw4qAszZLGEprLAUUJISuNn0cn//d0zAHyu46KIf1lqP+8h6uBN2HiuAOHw8ZD0KdrQZPpi535f93SN79PpOdk+i7kOp4ccgrlV0GxmPXvuutceNQ1xL5oIFpbQtVhEDPjJyCdA40W2n6d7uT8/Ks8N79t5LB5FCV/HDaGYwtOiiQEShEG0bu6RJtZ4iRMwrAsTDjkyKwSIyIVX4CLjY1FLzTYCHOHREhMcUjuurbiVDGkRd5wMOCeKIY2lA1Arql7UqNOCigojHChwVTEznrVn0CITreYAIjZ1AEoi2HUsjQqB+v/3+sO/+5X/nv9z+l3/kfznhoosuAHLRRd/v2R5/ixeIH+6A6ZrMeyDf5FxrPgI6dkvmo3W78syHPYkWu+7ocvVYlXcpcTuDB91I4a5DOv8wm5JwqRMgKeYmlhrxaUIDD8b2KocO98N2qygun80FPqxmPL71LZ5+7dfw0v28FBKwJFK6GRhyF5mPsFkRs0mmKbsL3JazMfQwKJBnAGKpTU53qwgTCQEYVkCW1wjOtjfpHNvzABJoEmGrEjUztO1UC4DIAiqwUtBcHjpytUntWh6yI6nM5xIx3FrwmjtAZGrw0aDj7J5rdEsYEISXe7P6M89a8IOxXqBluUIkkgmQqvn7EMMABSKbhSJCiihTEu52lJcv/+DomRDDRRf9sIgQ/KuWWo/UWuvOBed97gNCtnXrVWE8tq3F55lXWvTaAeTRNa5fG2x4HJkPgdwpdJ8kDUlTy3jMHC8z8pNEq+2YOANHNjezxfnIMZzP4eM3+BtP37V3719aHQo4GY2tTgSClumoVlFVqCyHCiSM9nhdLmI1GY5FBRAjVRSDDrJOazhkYNl2JZ7xkF23U4+6G3ayGTZz9iP10vmRliOUkNRQ6CBVFhA6BxBJTJ1QknsQSK+mQ818GCqMNOhQaEdjPSfYkayvi1hQktHUxCqMRG0IFN0//+/659tlgOFFFwC56KLv62yPZ9fPn08343iq9R45lyuyxNYrP69TzaMGJB67TqnCh2c+AkDKE1U+dt/2PVdLxiMc4NGlBBUXXA9F1Mk8FjOB25YPzrUoeulwFdCxuCyF5eHixeURAzqsvPuujd/+Nk9/6S/x8Ou/jpeeBRnnQon6KTyp5i7gwyynMJkDPlKDkZwLciZYBSy1HeGzgmtW6AirwiMSaUIiHBIXPfAsk6Bx7ZVtTC5CJNYNQGjnBeBLRoNtArtZRFaYOPf8vLSAW9dqQ9xqS2Ykx/PGEXVqO4nlXkI4B6WqZd3gUN31GjnfS3t+qLFHBHc7FxLqrlEEtjxQ+p4wE78XySKgG10Hu77u+ezZnzjgoh8SXaaZuzc4YuerbUBHXecZPpZtV3uWGnc66RUKrll43Zf+Zm/7x1tuHyv1iUKvkqS1W8MqGlEEUtcA2nYrOysoL35mGXP2YwGQyH5MBzuMARzv8t37D/jBsaBwwmQv+XKKxwNglmLx+v066bqAnli3OSAtI3IGKI0/xGBtCxfqQoxtAOECIFyllUQGJEAkomc/wrru1/OWrGEbAFKhY/nODX0W4lEprBBirSvX/KzmlJSqHbteIYMQbh3U1KP07mEBjg5Et3TTak5tK1ZmVoMJSaVRt2Xb76c9vvZHvjb9tm7JuuiiC4BcdBHTV77y3u08yXy86rpynXPeLxAScefR4SPO8w1gt5H5WK+j01V53HUM74cBvbvBR1ray6pUoc2oaB+gLTzXKpAR545MXAYIWnFzgQ+bMx8l6jy80LyU73zHxt/4jVLB4y/+xXJ45x2extHQtlyZlU619CK5V809mXX2lMKlTAEfYZZSCMBNLhPK8ZAFqU5ntR9p6SDVAIQtY7CcRwxFbB/2Mcd52TIibeYICS6uWoYjVgAJeHAvmYwKI2aGBnAGdLFesiDaYntfc8BDu8cGCyGZVeMCHWdZG8H5WmSGEADycA3u9uUEy4KkpAVGQgyXIqXryGliWWAmzJRUXnvtD/G99/7UCRdd9IM+VPB+gQ54PGHvnuGj9DXjEYbNWRHNekXj9QIgMfX8bs/9k579oyRpM+gQdR4aahkIgTSDIJf6DZvniGZr2Q8/D7etV1PY4eP41J4e3uE7Lw1GnClAJAYDEuRe96sedZtXzQD02rchhNLuw9UgSPCQ9Wi1JDR4ZD2vdSgiYr30tQ5k3a0lsh8OHYi4GepaIgsSju1XXerEjwYfelZ/Uq+MNrKwoMFHxy4pVBNTinWAiFBUqb3HGT5M5mJ1zpGgwpA81uyH0R66eMDUaFKkJAga/HUOkemv+8N/3fjbAiEXXXQBkIsuerb+4hcPPpF8vCanmG5+03XlStX2KZUoMq/brUi79njjMeaA3Dl8xLYrBw/cDQO3DTzatquUqOGl1qHCR84akGHjiJwzLDyf09dip5O5uWy9iuLyHNBhc6Yj529/u4zvvFOmv/SXyv2v/3o5fPObPL7/fsnjONd0kKzwIVL6gI+UauyAnNxKjgt8jGI26TRl5lyKmRQANmcxaA/AIIzY1MDhVchoALLorFaC2q6FW3YFoJHAAhm5AsUrenh89jSxeCxmYqQaoBBJJBt4xPVWD4KwAYImkfanoK3PMxrhOG/xDEra0EM0UJqfpx7b15zVQOcsE1JhyWVAAIfUn8NMioiaCDwDElPq/3YD/viIiy76QRwq+DdiVTMddGf3hO0wDVfFSgUOnbR1uqq1Hh5vJEtkP24CPtT0RqnXW2xvBxlWdatVK5laxgBG9KNtcoTBbCkytwKPnEpmDtd6j5Hj5I6C8/GFvTh9YB/cf5PffEEQH6YOnV7L9TryEA4KwyCxGWqILEi9D49JRKDw5dnQDwqrDBa2Bh3z/WW3LwEGgKzTOhygETG2XT1kQYa1rLpVII902p3PW0eDr+YAjGJFQMyZGiRNNv8+y51ax/JlnWAIEAnXbEecewwrwQYdqbBomEIU+FqKiImamJqZ9tZ3+9M+/dV/+1+dL616L/pRV4eLLvo+6mtfu79are6vybILyHDvcy5b0naA7UqxrXsnUnYkrs0CSnDVdXykGvUe4msbug7q15LH1IbpLduMZCm0XrIdDABZMiCFAE01rEwpU1U8QpYMAANOTqfoZMX8/DnH+/sAF4qfl2kyW+ZRLAXicLF1p1pi7sKR7TCbEjmK6ijk5LalGlMzIEUVNJN6L9NUCIiSIl2XXEpA268Ak4jo8jgXWImQUFnLVKRlU8Q8KgmPs8maBRAzYilAf0XtOmlWjVLoap1qhPO9KktREVFdrqubDYZUIWakCKGVFIoAQhcAlflrIESRc3pqHa9wLjnLzpRxZCtFhyopgkTO5yJsP8PKvTfjCGAkOXadTfu9+t9nrkX0AK3r+vLaa6NntD6YgNsTLrroB0WE/PQ/+NOb98f3t2MaN2Uq6zKWLcea7Vh31q05cRNrFGxpc+G5Ft3RuK/AYtiR3Bqsy5LpsTqAIiGJUKiikpkFQCEoS82Gzc+cQcRQY5it/uPEWvcxBnw85dMjPkIJSW7kZn2jN5tBhr5D3fbVCUSwZGmXHKliXjcZyQpD4XYf1rZfsR6WJTMK0IsVjeskK1glTeKQE4XnWKUVovZDVdGxk5RSfdwFNAnaeEMNez1LZqGmCmqpwpFQJGKyNopJPCaFQSic2/YqKowULZ1Cu1gLJFGoIpKQUQEm1kzsLFsyNQGgWwzyRJ6k/+yLX3j/b9j/4gtcdNElA3LRRZ+nmP4d/44/cKc63aqOnvWImG9SsiuRyH6wTjcn7QqwG4935Jz9CPgYBt6tVty7+2GoxebdAiBtoB5EZvh42GYVsW4nilhOJ8nHI/L9veTDAbWgvBWYP31aimc6xm99y46e6Xju261OH3wAB5AKMBLAUcoMOF3HPiX2qta37Ve+7lLKdfsVMHVhs1E9pgVG3MVITgAmEh5lEpFMavFoEYGIIIAWaRZrNjA4H9BHP291HnEuDYjicTOTBhOlGOf6DoaxAIor1i1aRIlzkug6Qd/PtRl9n7Tr1KO6BCnNMf4QUYl4Bg50R8Tslq2BnN+7yLxuBnB+3p4nDVDm4nQRVEl7vGVJllbB8/cwY1EVWz7mWNeJiUjNfg0DjBReXUXW608egV8kLrro+6xv/EPf6Dff3ly9mF7s17bej6dxtxpXV5ZtJybbksuWecl6FEa24wq5+hq2uOA64ENElEv2tGY+qBJq9RYuVBGxqIARR2EpBCmYj046JD9atgSAFJaaCbnH/TRhMnyIHsmjzev62tVOd6uNblcrXfeD9JGFcfcpaZcS5nxEQlpqQQQE0OAjM5cz+GBhmQvi6bZsKkqHjbC4MaQBrRDdAaTWfvRdjzn304mKQlwt+7G8P1rXpIAQs5q1kBk0NJDFvWzDovYJXVrGMiXFXEBPsiOY3AqBGkxjbeIHqmE0daflTIxuWeZCgdJThLbtf8ff/Dvs//PH/z8nXHTRBUAuuuiz6xd+gf2XvvTy8fF48oLxfC1SbgG7DuAAWOd7LFuubtzXEUuJNa+BaK2L6/Wa69UqwAPqTinZsk0H0uon4Ar4WGo+bJ5HwYhlHOdzN31dDgdGvYfHeQtWrCPLEQXlASc5AyQk1HXWdx07EUvhvre1ahkCRERa7Yf5OmKFkAAQdSeRSefsRzERX4hlM4yATKUwi2gB1GMqZqgw0qDDjC4JeIjzWBs8zNcBq2dsUYDZpRjM2LZUuY2loL5uARgC4m7r9kH+AW5SkgCQ5I4p8SkAJOAjzufexuJKoqoIA9LuxUP73u3ewufgFLFJcOYq4NVrECwqBUVbewEoY0EKzUBA2s+oJEIGSLUqmFKdC2Lk3Fo4JeHd3QlPn/6JIy666PslQr7xb/jG9i/xLwV81C5Wz0/PdwEeecr7XPImwEOKbG2yPQv3FTrChisxufF4594T7CCQhucjxvIMz05wbbDp1dVaypEUg6GwGEETCJa6CnFzm7ZR4A23bHVbB/75AbduZdvdyu26R58MZstMjarIPbylb13vHT62abde67puv+p1SJ327k4TUpeWLWG+btvApE1Zz6wwZNayHii2QFKeOIULybiXyHRIZDoCQBw64NAhq37OfoQbgLRBQjJrhi+LQCUpYTHRYiWutxqQCiBq6ucLeJg2+GgWCJTCCh+xLlJiXd0QJGuG0RJcFVBoSqtRDJBY3/JWf/Zv+9nPA0IuuugCIBdd9LM/+/vfMpuugVrTcZdzuZ47W+EKMI9h+mMVQG4X+LgBeO3erFat0Bw6d7hiazcrImzbeUAqS4G14vLmcQwQqWtbtmNxmkgzttQ7zCBm5OmELEIFKBFV2Q0DhyXrMbgjNg+q7EupYFLBQ6QkmRMbSmYAxZ0NsEnVluyHjDljLCUgRP08ZbMaCykmArqsFIbaNiq2LVRYuCOCe4GPCLGe4aMUc9dopYCxzpkNDmpsmyBmSbV4SCkgTxw6NOCjG4YKIKnrVFOaLZLa8EOFy4wLJIVaUXu7hvb12WpCPk4PGZGmBxiJk4CQh8GJoVZ4jrLAmZtqBorAwqoSa/S9+hqWEixnYVx/+vRvmYA/6f5t10WXieb69W99ff+t8q39e9N7uxeHF7tpmvbH03FrxQJCNt3UBXTsMKG21l2V1c26rO86627E5I6FNzSuW3Fzq+mAAC1GVUQACEmcF3qDQLwmoGPbbWWXdjHAT666q5gsrg4h6gAh8Xgcvo4jBYBsdNPtZT/4elCqPMfzMWDii/rFm2u92kTmYx21Hzr0gwyp15YBSZ1HTZJSRBE5HzTYhh42m3vuwAUHj9YG2MZcWLBkPwIw6K4Q0sBj6Jbi87RsAHO7EMd55oPGem5mupxXCElzcj1VCIkY56ZJILpsy2o4095vdYv5wflona9aNgTxZ0ZWEBI2mhqy0CYUFOlMZVP69Lv/4Ov2//l3//KE/xKIT6eLLroAyEUX/Uf+I4fbr33tb349gGIcp5ucp0fTVK6WOo9W/+HRbsI5s2ZAzBjekxxURRb4aNutoAptdRARm8zElsxHaa1gT6eIEm7bssyMIREJAwRElJKSBOBoKeCyBSk5/HTx/VNCtwwGXLZbcQiLMJmxI4vO8BE2AFlII1nyvO2q0shodRahOoCkMeI0pfF00mPACKDWsh8i4AIeZlajG8WstdA9/8CPOG/w4a6Rc+aDsa7yeJY1iXNpW5zmPzzEe9z3osMQ08VT8hiZjxTvxTLw0C0hXyaB6+x7wC3tPCKJUIvikfgE+ojnSYtmsDApaIMTXdZeS8p5a156ZEoVRDyGtYTNNAdwHQ5/x+m3e0jhRZcWu1958ZUdgP3T8em2HMv+MB62ZSq785kemrUOFLwu148f2aMn13b95BrXT67s6o3ocrXHfr/X/eCA0MVGpMhKKFQoD/NG43qSpA3n47q4eunTtR8BHOHr3tf9VQr4qEP80kqiuHvlx+BH74fH5K/TcIcuDUvuga4oOm/wsdH1yp/dt85XNRehvpZek6aKBmfboWi0lvEIl6UTV1m6ceWJozviFAXxASVUaM3WxN100qHG1AWAIOJ59sMPRAyBaFKjgUaBQey8P7vZUvMxW8IQEUJk2Y621LBIiEK64YeYWGoQ0tCjoB6MtVvJajDO57Vkm0RACFP3U/vH9g//yT8z4hcvEHLRBUAuuugTb7n62Z/9g49KmW5jmvk0FQeQ4uuyL8XCV9NUMx/XpbBmPEopj8wY5zcedwA7VUhKkAYG86bhBh2M67Fog/SYM8oMG6gAMo4ynU41FndASDEDzQgRtslXSFpjXIEVxNeh1unpYdF+/n/0ZSYHu8WDuxdhb2Z15oeIqZthEgWwCh9mnEiMEXPWUyldzjlNpaTJTB2S9HR/r8cAJhFC5AEsRGBnW7KsgcgyyyPsqgs8rNlsQMTSwIQuLKEVb7cP6vHzBmgEgHSrlepS/xFO7gU6GngoXLpkWoxEJYK5e5bF8tXOXcRnl7y6br0665JCQMxja+SppCqAChwi4Jz9EA5DQAjqtb7XsloZvB7k9NtWD3LRpcXuc+xuupur4+G468f+6n683zJzKyaRBdnt8u76hje3r3nLhNty+7rDxusOG0+22L624ebNjWwebXW7u0pXaweQ9U52w1rWXQBBJ52YGDMyIQBbdgElbPFnZDHuurv+drjVgI7r4bp6P+zTJjk+dGuJ6E4BIe600lWFj0GGuV2tdBUgOnS6k218/7U/3q907R76QWtOousaFsi8TphrKMKGVmC+TF1HtsxCY7Fsk6+nMkXWg1OtPRkx1mL4ox2nwjLXf8ggAUddmjMhsY4YTppQoyToAy+AcbBaixUYrQGIn2cEhIDQJePhbq8UbYnadgUCumukEhSKYanzWFYFJSLNI0hhMSXhppBFzBiP1rUQGKD6M4e3ywIhH6eLLroAyEUXfeMbz9ZAvpum7GBRHCzyzfGYHT5snzP3AR4BILENy32bc0CHNfC4JrFaekWezYwgAgQ8SgiuOQhJuAWt8HzeaiU183E8yhSOdSmtWxPDsRAB5nUcLjMgF9AIkJRhYL9eyzDXf7AHzKM1+HDbAKAzK7JATQOG7DFHJG0yQ4OPscGHO7IfU9jXAUl+z6wGWAW03/LDAC5bjGClsDRPk+Wci1+z5kolsZ4zInGNbis5R5zP6TJD1bw1qW27kpr1mN9viOocXRHVQysKR8skTVNr2xvRaPZqbQmIps+S/fgINQBdYNR1vu2LAkBVwdbGNyUxESmqYl2HWi9USrIvfCF7Z6w/dsJFF32vRAj+tdjghN0X0xevcMAOI/b3030FD07clVJ2d+Xu5jV77fGt3b625fb1NddPVlg9Hji85n7SS3896LByd8vWJnWnZcAgIhYWRqE4BDA/DjjUD+8xKNDhJb3Vv7V+Y/XG6m646xxCwpH5SLt+p9tum8Kb3uGjq/ARR+BEikxIfL+zSeaI2KGvZd+ApE5T3QTVY/DYues9dp2c5VEhYrQGH9ld3BU55mPGgBFTmbMeMYPkGAMQj9EG+H2+fx9zSAYOFZN67ZEkzXkW6SXVUvcKIGFErEI9BECDjhpzyVKjZSlW4rvWc6G0bEdzPW9nEMzWGpsJhdh8JIOBSgQwGdxGBaA0e9j6VYoAHs2EBJIJVIb0c4e37QIhH6OLLgBy0UU///MvdptNeWwW262yZz6m23E0jznAo2Y+SgnwsOpSZvgw4w2JKxHpVaV94kUzqYzwMLBO3QAZVpqB8/aqVu8R4IHpcAjLGI/NUPNQW9CKtuNaHI1mRCjwmBJ1u5Vhs8HQ9+xV0amYevR125IlPUBd6iwKgKw6wwcpE8mpFI7hqPloWY9x7Cp4mHWFTKUU9SgLSNWhiP4cTjN8WJtcXuxMM4DUmGOds2V3aY7HHs7jpRUS6nVWgYBRFZxra0SHIeAj1uoiUlJp79kZfIAMl7b1CgEd4xj3Ya1GRX7b4KO95pU6lhbFRSKpirhNFSUupQRLKQBEy3qtvqYdj7D33rtsxbroe6RfQcJfwBoT9ldytbOD7ctY9jbZTrLsTvm0HfKw94zHo9fx+utXvKrgMXB4fcDwqGP3WkKKoYLbqKvodR7u5+cqLT2Jh3ka97yfGoA0mR/Jj9/V/65HX958efd49bi/Xd12Yc98dA4fadtvw3WI35IJia1YFT0Cc5b6DVlmY0BCFJVYLXNDhZLmvENFgLoOBFDMDwtkmbqeS7aSWxeuiVOsWFiWbVdT8fMyYswjw1M+4TRNmIqJ8cBDfqe8c7/HftilXcDYnPdYkCzFoWmGpRAUZ21/hSSKlQohC3RgWctkk/i5gDir8wgTbYx6A5Dz7AcUyxPQytvF1NKSAZFiWchSHzESoCnNlvO2N5aiEAzssMLeMyFv2D/8p/7MCRdddAGQiy46F+Ub3/hbr4ehPAbK9ThOt6dT3XYVgBGZD3e5atmOabLbtvXKjLdmshOR5D7rgjQTQzPwMLRuloKEuc+yHzLF1quAjiXzMbWp3F0ncv5hWpNbZ6e4Pvdc1C5Buh6y3Wi330tkQLrYkqRKEcWyBavea9cyAUtmYhJhBmScMx+c3GMpOD0UnHc120F2BUgm0plZMhKtkH4BLkHO8YHYHKQ4BUSYtSxGdV4gJGKZpgoh1TOIMEdmJGhjhhPGMrtbNiXMlIC+rzU2S62HaEoQVeJ8OrtbIwIVOFqGBaUg1rJsuypLFkLwidSeOouuj3mp4FOpZci03X+FkPlnUlMFZwiR0nVifY9WD1JUL615v0e6bLk6YAPD1Z77XT7lPY64QkadZj7labcru6u37K0nT/jkja1tX49Mx2DDaz36x0p9rKI3nXTrXvtaVxFe6ig0aRKBVDUmjw/scGXkOGfD8t/V/a7HP7f7uRuHj+HR6lF/5/Xs16vrbjc4fAzbKEIP+OiWzEfM1IjaD0lSt1zhoW2uhxChbiFaFQSksAgEWKBDEjRFDIFY4KNUuKiR2UaO9HP4umY8Flf4iMcnqduzWMS4tAVWgniJl9PJTuVRerSOPE0FpFTvtcJHQoqIBUKkzSLBLClWwiilxsiEaLZcASQ2exkK0CaXtNy54FUzouj8WGtvEtdNbNlkVbSwJJJSrNWdVEQBrQhBBQEhYaRooSoSVtjKHrey/5se25/5T10g5KILgFx0pku9x/O7zWa8M2v1HsVjZDnK3uNumhjZj3jMr/Em1nPktRk2IhCcKc5fNXA+S0JoBuQsrbVuPp1mH486+XkJ8ADmssEwKRSp6ypNbkGNrdajuhddrzRtt+rwkQI+AjrcSCLwKJ2KKHxNiswZCuQAECAsmRSPAQ4cwzOApOwuZGdkMpFEM7X2oX0WcA4iC9zUwYgBIxHnbVfVFTQe4II5ohmL22Ocw21xvhhuMxFY30NWq7DIGXy0HjoMAw1EqEvHsKWo3RAxZ1vOgfZ+f4Jshuv8sizw0SSfPvvxERKBnBPrkgkpbgIwIGBEi9uGQTwyrsWQwvyd71ympH9eumQ+lqnmxZ2xlZNcceQu57xhYR0ieG3XV1/il9645e3rG9u81rGLzEfNeAjlTkWvOulWfepT23bVpW7ZIaniVhE5H66HDvVxkLSMeSDhl+RLV3/59i9/9Pr69dWj9aMh4ONqdRXZjxQZDweQiGE5hw8/dMm2tO8H4CFz3GZbgIg1ih+kQfxQLJkHtFa7xsxic73HvO1qtEj5TsjW4GMpNPeYkQMPjPBDiITU5nkoXAEn3+K37nvru8jlRJ1K3GdYRSOiFbu3GhC4ONdcoGU/csmSLUeuRXLOkf2Ag41MlkE/WlajxZbpeGUbVohUtm1YpJAmZgRRWNTMzZp1iUcSI8K11J+AlEQBIB5VFYlbWcnbep1e/wOWf/k//c3Lf5suugDIRRf4+PVff/mYzAEV7nxzOsX2q5rlqAXn87oEcFzPEMJYR/bj0XczmX/ZKmsLcEwRG4h4LGat1mMGjtkISbveSjJVRfoeXd1+VOsfkFZrdKtV6oaVpgofiRU8gIiiKuzgkYSQXNr+cjKTSQRuyQBzKRgftl+lkUwF6IpHA5RkWAjgrHFm+xPSppA3zd8HJTIisd3J7aBlATk1I9JqQhqMkAzYcNcY5x5oqsQwBHiorNdS45IdahkPc3M2lzuiWBBNZs185Iyl6D3iQwcyUvgqGHx38CCfAT6Ic7VtWMuZApQZQmAeLaIIIsZWrDIMkj/4gHzvvb/1CPwJw0UXfbf601D8TVjjvsHHXO9RxrLTrAEfW8myfWyPb77ML795w5vXV7aq8BFOTI9A3Krottd+cCd3F26Zj+VDtVDOSqpJM1iY9cM8Jov6j5jP8TuH3/n4q9uv7h6vfevV+rbznlUVPiLz0bZfRferTV+3XsW2K+l16WHlh8YBBUEBQcMyoMgsQKDaaJg4cmI+K7ITEWAmfxYrzO6l5oNxhxPdASI57OsKHxULUGzpHgVdWhc2u8RgDECJ9bVcbxxAtGZBUCFEWj5dXO3VIFCshCVitiy5zPAxlhHNx3JkHAaTJbNRHeuW8Vi2XVWfgUmDjzDiwFJbGBBSjMlYhGYCoYCi59UjhIhSXIn1cQyy0T162csX/4BeIOTHWhcAuegCH8M3v/n0ddXphmz1HnY9jowC86tSIvNhDUauAzoimgV8YAe0kbyQT1sjEP6Qax8zS0LQTArDXce0XmPoO0nDSroAkNVaa8Yj1h7b1qsOwgRAQbdIiti6aeUcsCHTXHiuecmCTGY4uWurXSAZ0LENzlNtRYzViyTWLYZxDiENSkJLJsLCASPTFBBSY82AlMIyR+QWAVpKCOjQ7VbTZiO6XqcFPpSqCFFEljVlATUxQ00pLTUnnDMggvP3nuc9Pz97rUdbCj6V2BYfBSFtKxZFtHg0QMzX1vfi55JVWbMiXZeyDyg84KLvVpd6D2AHcxNbnGb4wIRdX/otMzeppP11uQ74eGtnu9frdiv2TxLSY4XeCeU2aYpC8z6qGsINPvx6q7lo8zzMYM1YPtjXblEnnPIRx/Jl+fKj37P/PddvbN9Y3axvend3NVzF1qua+XAQ0Zr56NczfOgMH62WQiAiFCHYtlGJu9VyIFesmAJCOFmsRsbjDT4AqfCRl25X4QU66r02+PB7Lic7TbH1qqAUE4I0OxtJSixSqEY0GgnqFttNtCNeiuRTPL5kSsTXAkGbv9FqPuJOZujII6LMvb5b7oj3+cBDOViAFWeWikgKK2CICDxCdI5o1+SsDmQ+aH4ALeOSpaDojIxLemjGFhcjzol2mR+hR0XijVxLci5d/aHd+Kv/qV/N+PHRRRcAuegi6je+8bdckYcnc5criy5XN+MYrXWjzqPWfOwCRnKet1wtBec37lszbAEm/ParQQkCPDZbGVYDhtVa+vUKfYOQmPlR29HO8JEg7ARMJHTZxiMWNrTsR/E4ATX7UaOZjGbIpXCKeD7Ve4GP5RzSlsuH9wU8hGcQ0rSsGZFY1M5LaZ2oWNw1Q9LqQQDaeo2022na71MK8FivVbsuQVW43BtVG+wAXJRzwEZZYMtcdDX4EHFbgwUzKbEmwU8ICQJQWuan66BRj7Ldot/vtd9updbhXF3FTJKaoRJVSM6wTw8naIXpbSuWiaCkJObrEmvVlIdBi8OZX6e98cbfMn3zm39iwqfVRZd6j4wtiB0mbNen9V5HvdJJd1p0i4INM/dX5er6K/zKmzd288aa68h8VPgQyiOFXidNw5LxCPioscHHsqUILjaeN1hERiyoSFCiEP2AwwgB/vL1X3735e2Xt7XofH3bX61m+Nitdmm/2s9Zj2Hdis4DPkT9aPCOZkMFi8XMNsPHZC2TUYcF8mgny8zzvXG+rwU8LFyfyXqYA0d0uSpHO+aDHcYjj+OEKRuM0mb8LYeKYr6l+YJAUmERpSaD6YBh1bHrApoA6AIpLS8hS/ctLBkPBKJ5lICO43QUNw75wGM58WV+GQAS9wiDsVqqW5YD4YZYLVbJw99LOGSc4wKJ8xYstK/EGV8qzRCYTyCSIJooEKgO2MoGb+CRvvW3f/n4y3/ilwsuuugCIBf96Iv67/h3PLvdbKZbIDtYlJvDYbrNeW6rO7fY5X7ecmULeNht235Fygqg4PuklKC7HdfbrawqhGxkGGb46PseaXB7rINzk6LBh5rBTSGlgsgyK8TcxX2aC9Bl6X4VDvCoBeGjiODBVA+xPisJbbFBSFtLg44qM/ATZofazJDWbjfgQ29vu/hQn7bbTmPbVd8rVNt9gaoajvNl7ogxgGOaSjGDxboUuoQLiIW4gAjOogHyCbMf1sBDbm4wPH6M9ePHunrtNVm9/rqunjyR6ttbGe7uZLi6wrDbSbfZSDfXAMFILCI+Rq9sw4Oi/sgyLYMKTRXhkpJmj7nvg7uS/fqv//HDpSD9U+gy2XyAYY+C/a7sdumQ9jbaFTNr1mOBj92mbK6+aF984453r6+4er1j96jCByTivtOub8Dh7iI2+PDHKny0jABDoBnnIzNbyygceBi/yW+++EL6wtXv3v3uO996NUTm42Z10zl0JIcPDcfWq8h8hFfdCp122nKyLb3c1m3L1bJ1KWKd0pGZa+5ijIOjRe5gxFjOwGhBlQog8awGKzXjcbTDdO/3+4IvwidDtoROFSrL0VYtTaxtJofRxKPWSKSE1AWQLI9rxCXzEQZJmfIUGY8GHwzwiEzIYTpU3+d7VACxAx2OWGBoQLEYbHlpraZABECDQY8lotu4HNa+xvxnUY/1Pon2y58IChFdEiFClQ5JEkUBX3OXtrizK3n9b3n79Mt/8gIhF10A5Edel2LzF4+GodzNW61yre0oJV/5eXgf2Y94bAaPAJI56+G+JqX/KPgQgXwPsx7tQ25a4GMI+FhvpF8NcMdWK3ZDHxEpdeza0EGCSs4AQiKRgtLgwz1NqIXmc/YDGQgzm1kuJa7TAAmhTW938WyflZDgQ80Hqsgwl3WL+NRSDfCID/Rpe33deUYhpdWqk647n+8rTCnV81YvYxY/W93eVVqHK1RJy1jMK8pSAyI824K1+LeSiQiwWkl67TWsAzoePRKHEHXYUIeNmv1wYNJuu5W02YRVI8bfU2R0xHU6Vdjip/z3IGbQ+VyKCIuqGCB5mZaeh0GMDBgp+b33/ugRv5UuutR7/EGsMGEPYrvN2105lV1kOjhxw+LO3CJjr0UDPl5/jMdvrrl+vUf/SKmPE9JdJ922ZTuWCeKdn6fmJKnNpGgfa1vLWsusjiM+0EcmYfqAH9yf5FT+yuGvfO3t7dubyH4EgLTsx3a1TbXr1dDqPtYaqCMQwSsi2VyhozSUKLnmMip2lNGO81EcQOzIY2lbw/Jc98GAowlTxICP7M+dDnT4sPvpBZ8f/Z4PL+z5KaFPaxkCJtQtAlAg1v7bSZBoSVuKGEwUmooVpTEJJSl1BhBCCLdRzUyKFYm7CPhwCKEb4Qof+YCX08sKH268KC84cpynmLv9QHj+/oyIKkGDD3GzmkQ9XA3E2Oa+oxTOUJPcKhBpu25r0EQIoCqIdVKlSKJWMEmMQZFfwGP7P/6pX3qJiy76IZDiU+uiy3BBrr7znZePVOci81LqkMG706m0mo/rebp5qdejze5SaH7n8YpE+n5mPrquZj5Wy1yPlXtYrzAMAwI+UitAb06Jaf5svrSXSZCWtbA2dNwkL9uriqq6pa5JKXEdINWVkso8xV2w1H/EOpZhnEe4SMKsBkbEJxBZzVd+5uTgsXnjjX57ezv0u13XOXykrtNXACSdFaMIS0EAB08nljnrATOL6yxAu682yJAAmq3dv3yS7VcigANG9/bb2Lz5pjgk6eqNN9LgMSCkc/fu4ckT7dy9ewjHtciOhN9+WzZf+IJs+170k7xHTQsQJjPs56n72JUSkVdxLsJ912G73dr+C184XgHvD/goXXTR3wfFY2ww4QrEfnPYXJX7cmUn23PkloUBIruAE816fZtvH1/Z1Rt96V9X08cwPBbKXZI0w4f0KWK1dKm5bSXCeRtb5uzRXAwXKzXzMXGK8unpKZ+e3pK3drf97bBJy1DBrmY5JOxrGfoh1jp0g7iRNLVZTIjY1i26uTxHIopKrNvWqKWDHuiyOrGchzEAI0AjIOOlvZz8Q/3RfXhenh9jmOAH9v79O3z3xbv23v2B91MgjT9vPJVIwS4i3XOiR6niVqGImkpAClwkKyg8s2f5vem98t74nr1/ep/vHd/H+/fv44PjB3j/8D7eu39PPrj/AE8P4ad4dnyGF6cXqJNTTvcBIAEjcswHnMoJkeHxyKOvPVo7Tnn0a8cyr08BYAggK1ZAo5CMiNDyDqmgVe+oLHUeJNgX2MZg23ARjyw7grtMXmUbr0abriYrHm0/+bpMuu/K9tGf+PafeAJCcdFFFwD50dIFPj5YX109fZTz6e54nDz7kcO3AR85l5b9cOcAj5sZPizWd6Vg/wn26n/WLEibWSHhlKDhrkOKuFrRawiw2e1kHfCxXlfw6AM8PNZi866X1IbxtQb3YdX5tmgCm+ss3OC89YpT23q11BAYABNhWWoLoNpmj2h1SrEO1+tVHuXV7UkPsMY4b2rnbOuzc56/jzG75M03u+0MH92w3/f9Khp49klSSnM5Y9K6nn/IBECQM2wczQI+SiEXEDrPyhjAiDSLtWE+b/dhIkL5ONhsGZ/ra+nfeku2r7+eVsu2q+HRI+0fPUrVfs2hI3Xuwe1gEufheCx183MrlKwcYLYpiX4S+GgSUfHQB4SUgi2JXc70dbkyK9eA7Vcr29/cyP5rX7Obj/iZLrpsuVKkecvV3vb7zf1mX05lb9nqVHMW1hhw4uuroQx3N8W7XZXVk4APMQn4uO20W7m1woa6I55NN2/Tt0naMrSvLK7ryaaAkZpRcJf4sB+TwuPj8rVcDzHVfEgVNMSjxjqAo099XIs13JJSEterwIFXgERcXIBjNmqkB3DZgpSR8z3j4/z96LmE0zM+OzkYHJ7b88NTz8y8x/defse+8/Ide+fld/jO/XN/fMJUSCMInOwYoHLKtjT8NmaShqWlH/w472qVmNRaRoiZDjf5vdGR5vSevXd8LyLfPbxrDiJ0ADE3PnD4eHp88PPTc7yYFhDJ91HHgqVLl4QdNmJLVtiOyzGDicd8mkcllkkCQMJGQ5sSIoQKVOJ8ea+qRdQtFKCncFPACiIZZefeF5RtIR088lXmeFXMrlDkWgpvlMP1Tb55/F/94E/d4KKLfsDV4aKLPvG2qxfbb34zPxKJ7VST29zlyuO2FKvTzXNurrM9dnM7Xu7MsPpebqtSBdyaUlhqdvp8gHp7XmQ0GnD4uhYzd11de0TnjnMVWYoAAWmj+koBcgbnSMsFNmXOLeILylL3UUi6pQDMJMoMRG1qeGtXy5ZYpwtN7UP+x2U8zMgzOHn1g7W42X7e2KL0xhvd7vY2rXa7vptnmSStNKb1zuThQ4RK48OcGfARmQ8z44d0GhOaweb3CULXw88y+5VtWsRHKGDPMxibx49luL2V/vZWu92ubrdSh6fklnkuS3sPpbX/rdPK12uLYnXt+wBOAwlOk9lv/ibv8SkkojCzbSk4qspJhKOZHs14zLkchkFOu50dv/SlctzvX7z8pV/C+de/6JL56Ot8D8F6l3e7POatZdsy16zHeqn32CAjru216H5d1ndRcJ6QngB4JCr7Trq+wUaNWmObYwGByLLdKi8fros7uy3Ao5pTQEftIuUxMh8H38p0IsiYjeHIob0fQ/KYappXwn3Xx3dtnjMYlBB+CwsEDAskYlNLklrUn7zrWY2JU/2ahYUEZbSxEAUjs9myqQkAYYYqziYNz+X5cVM2Ut8j7VQowAwd9CM9DIcSTUhWWBC4AMJEpDyz5yNHaLGidWtaPuHYHeFAFu8FkiQaDQTr/Y02ystp3nbl2RoJCJkwiZvLFrdC0pTKAQM6m5HRzEAlEYciFgIBRZfEsFAMdBmXO4ZqXKwvIpZnE0wQrouQKpy3r82vAghaEQggnR9qKl3uZK1r3U6P9E+//6cP/+y7f/YRF110AZCLfnhF+Y/8R4433/72eG0W9RzZO121DlfRXrfs5+GCEeNx1sc83phV+OiAVyUEKJ8RPNrQwORxLhhPSG6Zayxau1q2rIjOz6HMr2GzxutnM83gQjGbXQqZC8Io7mmC5UmstrudEPCRSWl1H75miQiwiMBSUmmD+8wUqvZqq+A4Fy4qJQwjCbOWYYgAnMHAR4mt3uP6OrYnpc3VVe9Zj67OM6m9YFIr2lRRTW5xpQY+DT7c9V4MixrbNM1zRNoFcTcwMiGFy7WPhZDgIM9YbO7uKnj0Xu/RXV8HgGABEHW40Doccc4YyfI+KMYRslpRVyuxrhO0ie1mASC0Z89kvL9nxpnI3yrrpmrGPYmTeyRtV4qeUuKxFB5TKoe+lyvgcAB4BMRwUegyXPAZNjBsd7aLyebbJeOxpjHW65RT3X6FCTsad13urte2fhzF5gZ7pKrbigGa2oA/xCqiQOg+KzBfaiisRMwRl4F91oq4PU6HKOK2FwEfh4xcbuRmtdFNN8ic9QjMUT866dBrhQ90Ojtpgkso/Fj4cBGzGCueH66ApAm1BXDxYvLpOZ+P4Pm8cIKs6wexxXq0c8sc+dK3a210hcGGQWfeIY26ZBHEYLYMPERCkloMz9NEsg1lPBnnlrsOH5GtkG3epHWqYCMAWlUGApYO5RC1HwEgPPpx8iNLtpMfHutgxJQSCovUIY3Wg4kKA5HcgCUkccWaImA8SiEpIMIhClpupB4qxIwxPaTVkAC2FNjVVxY3oCKQhF49aEGRNAPqV/++9/6+v/BXP/qrfzgh5KILgFx0UcDH/f3hloxuVlHbkT2WKDCvmY+4VkrxyKul09USsQMgnwUwSPDVa24ELAyDdMvgQF+zb9uT3WdZjwY5XGov6BYN6Hh1e9ar8FGMrEXXOaDDPdZIdwnnCXnKkuetVygAjERZ1tWqIu1jeSloXU2aaUZ3KOIMH3HdhVi7jXwl69G0LLmE82LzR49iG1O38WLz1Vzv0WtKqgtsQERa1gNhEuLGNNFOJ7OIn6SYe870ILUzQKRtvyLFlusCCD5Md3dYxbapmxvpb25m+Li6iuxHcs9F5nOXLpGUZIEE4QyClNOJ7HutmQ8RAyDMuT7Gt97C5s//+fLCDJ+qKN2MqwBokch+1AGSp5x5ELGjqh67rpwePcLV17727ou//+/HC1z04575CPjYQ7DZ2nabp7xbaj02NG5STnXIYK37yNizeCy46kp307F7DYJbUenFpZiRni7IHFs/B6MZgIgsVhqEtOF9sZ4H93F2ZD5elpcnh49j/dDvChDopBPVBW5E4W71G1zWy29xBDR+FHSgxZmOaARpqAfjKHFgdjviHlu7bbIhC+QMMghaOze3nCGIRfTC9NM6rzRJL2use0AEFKMuWQaJIEh+UIhsWaL1cLxHtjS8jXiysThcDF5krrtuy5WuK4AELMBV/BhtrDUfDh/w95InnBjv4SjxyJiz5GJq1rMnFMr5AAhp2Y5wYanvr0BmKGEDjwg1sr0jAqHofFFEPYjQ2BtoC3jESuK6JBEr1EKq0Wa8ksJJiVM6cZTx7T/NP/3r/2z5Z0/44dFFlxqQiy6i/v7f/+zx6XR4JBIF5FHrkW/HsVzN263KzdwBq8a4/ihnu3U/OoePz0uqkCgUj/qN/V627s1+H/UcWEcth7tfrcIcIq7XEcPmxeZtjX4Y6OBifd/X2AV4pGRphpXW1QU2jSwVNkaYx3AZJ0yTe1xsBRmQLKKLUUiZsx8f0jvGzCpkmCvnOcZ52M9ttlW/Ch9kRKKZBMOvwIdnFNLm7bf7/d1dv7q+Hvxn77u+1zRnP8JSo6ovRGX+HqCDRwl/HHyICJq4JHUWnIIZjLS6pmspRHcTbgm/2gwgisivrlChI9oC73aqu13yddKrK01XV536up63GI+7PbbrWtczvFTX9fy1ZcAi8pNCiIoZtqVw63FDchc2sx1ge1Xsdjvsv/hF3ALf6nDRj6/+QayBudPVZlzqPY62s2K13iNNac+J4StmXrO4M2+kyE2y9Khjd63QTjAfBjMuxdWFpUZb/ixW2harPHF26xwV10Ybp7l97XE8WM18HGPrVdRatOqxLbZ9Qw4AhMBXSrhU6lEvndVxoPlc5xBCl6Eddg4hDT6QmXHP+wAjgmzwgbbFtUHGsrawEXDTPODMBcWe8+Xo8DBlq0X3xWMpc2NwE87Zj4highSHJYki/GjnG619vaD9FP6gfHB4Z/rO6dvH74zfOn5r/I7Hb5++PX7n9J3p3dO72etE8vvT+/np9DTe0+wwEo4/p7GMeSpTpjG+d4W/9vjohz9Wq3JqjBWzFZQGZw9dsAAYZrgUVVkMnSGQvqQkIQWDCTck60BLK3ZV3DTuzewql3yTy9zy/jSdbvIU87jGx4+fP36TpOKHQxddMiAXXcT0+3//89vDodyZ2VUMFywlCs2j1qPsYstVrM+yHm7exLkZBnyOalutVitxeMAwD6HjUrMh6SHzwYgqwlgL0Oos4johrpRiHdfQ1u2xZduxsBgrcJQsmCaiZkBG4Vhb0UrxawEl2YoYRIq6ARSSEd0WkcD5LA7CzCKyQQg5xxk2wGmiR2P7medJ5exaVsdMlq1ZwOnE7GuaVRtcUWz+1ltzvYdvu+q95sOlaYYNcSsAhUhEgZkwFqWgbbmyGY7I32Jmh5xlqDyKkVxqQYQew9KAaVmLizjT7a0OkfUI8AhoaPDh1rnlblq2YEnbNnZ+H9L3ZErE/HMZzIQ5lzRNsNMJejigQsjz52UsBfx0mTfpzXBVCk6qkQEJ8JBDzjyq2n3fi9eBlP3Xv7668lqQ9/Hjp0unqwErHLG/wtUuT3ljk+1stLm9rmGbSqprlgogtTCdxh0MN1Zsr9StqChBti5WJLWgWGKSBULa/saWBeFyPY7S6hAmm0HkZPOk84APL+4+emH3Mc6xqEevBNvuKKnQQ4vYvk99aIEQIXkOHc2vwgfPDstLdcQUh02xht9X8XuaCgpfhQ80maGhiBEhLrazdVXAzNrW08pWKSEptD6WBEJVhVKVQnpE70eWLL31EsXvvrYNN+axZKnZonSUUzxeN6C1Ke9Gqy4oMHcOM2OkHxhLlpypNIG02hUWKUqXUiUhZZGZ6KDAcj0OiFbAIiLO090JtG1XIARVApUal3MaByPFQCU8liIFGZlFjXWFAFcK7TgdudKVefaL/2j5R08kvyMixA+uLroAyEUXUX7+5188cvi4NZuuT6foZpXbZPNtzhEZMFKzIHO3IIt4TSLho/Wp60Ba1mOzkdWy5Sq5+wCPZQtVjcvWqYjJI9ziPpsgC4jYUu/Qzs+ni0cUqzM9SsAHmDNl3nIlGCeYxwCPMk6ScxEjYCpY6j1QSGQzZo9LdyhbtlIVPGQ6jEu0nM8jreuoUfsQP6/DRN91sY4JZJJEIGEz2FyjwXw6YXz2zE739xz9eSnqPW5uar1H7x76vgv2EJ0lgJKsX4gLfKBmdcZi00TOQEPiU6llQaALGBhgCihRZSATAZ7XgSDg6u5uHiQYE9nDse1qs0m63WqNm43WIYkNPsLnSolY/o7VTDBDXBSm078G/euZRXesb3/buufPOeHTScy4iayHmR5FuDWr/84dQrDvOjmmlI6vv16ugW89B97I+PHRZcZHmeFjj/0u57y1U816bFgY4LGjMeCj1YFcwbBf4jUKdkLpCMqS8aCJWSsoV6gsk7yLUOCyVz7ox/OqA0ImzlmRE0/V93Z/ipoPh49DzPLGmTwjMrYcRSjWJMMNNtr18/lE+DCRxLKtqk0dCeBA3E2DDzfqDBA7lJd4OZF8gA+e13mYxMoMTWz5kDPXC4qQMSBkZ7sS1SzLcMGyfP2Z6wBZsgzSox5FoTnqUCZO0wabfsLQDZjSiDH17LUCCFSAh6GLfiwQYpKZceIpfkozMQphSqWZUVVhaiKUkpig0ERQqBQzkzRvfbXOo1IJX4OwomYiIJoXvZo/V1GNiyTXBUUKLdYzHknRuFY7omDCqGOt6zmNJ3MIiQzR67/x4jeOAJ7hB1UXXQDkosuAwe9858Wj0ymGCk4xYDBSuh7L3iwKzu0qHJmOUhqImD+XVyQUn6PmDMA8KLDvJa3qhHL2KYmmxBSPR1yyGBFFxNzQs1+cCRaJ0G3uVh0tNKsRZF1bKShuTBVAdAaQkQEfNk4zfAQsCIRLq92W/ZhI83WbidFcxYCGUmpcztsWLDKyHKtVhawh3GpbUpoh63xIIcDW9jcgxDMduiHFVMU2m06jxe522/WrVYBLxQ+ZPf+MYbOIKNNktd4j5/o1GfqtJ5ZTPuR6DQDPwBIym+06yAaFwtUKdcvVei1R5+GgkSSyHQ4hstmENc6l65J82L7z5VZFlXVtJlKKyOmUk7+Wmw0tvt5ux+7mRoYXLzh9GrSawVRSKdynxIOqnHy98/V9KTiUYtuuK4erK2wvWZAfs8yHYgNit6fnwI5lU8ayC9gIp5LahPO4tg/DcCVZKny4d0YTgqg1BAERMoNHQdHJJkABoQC2zAESI1ytDmTZ1mQNPkYby0g3xvzSanvbCh9+XgC8qoAC86jFSuQAYGYBPBVGinm0GhuQfKSWwYNo8DHaaDETY7Ip7ibOGYXavjZvtztGBgQEzuo65kjDsuVKzsrO7VXwaGrnUdR+sJoJ6RLSnNlRGAipgiBJAkkMMkiWzJ69HRnTPA4BIQEd8wQUruZ5K+xSm2CCMJfRgB4nTCyoWQZrReoegQImSYhlsqSYUzKjiKSKH4WakSUhIaCAQiRVqNQUPJddsDQxj8Sr4BGXElObc7LMfuGaMPGDZjbjRzH4wZJLLZJ3FwcRO4yHIpSiptMPKoBcdAGQiy7wMcSAwZxPt6XuL416D0bmY18Kd+MY18pSZE53BY/ablcE8nkPC4ysR2QCIiPgHvxaGwy4ZD8aeFBUoYDpkv2IKIDJ2YfjqtbqVgQsBfbQJ7K6lCKWcytkDotV58h+sBSPhFTSWb5uIS2bWXHn0maAmWGu8yhn8GEeWa+ZUVar6PTECljbbc3w9AFa4bT03FSFnAOIO4ChuG21YkdqURVLKdkwdFivo+C8jkue2+loa62rNJshi65SKsAwbPUKvhv4aOICYh1dgJz/rnJZJzcl7MLtrcQgSIcuTW5dr8NJHESi6DyiBnyoClQVDT5eFUkZBmMpkJwR0IL561Dnr1tSzBj51reQItvz6bMgWOXMnSpPZnbKWXyNY844dp0dzeQUWRCfj3P4H/wPbo/40dYl8wGsMWHv8LHLZc58tKnmKae2rsXmUuQqzMJr9xWIDQDFLB5xLN/mt19G3cAjfbRNkhSCZceOCoUoUqiiIhAxzFuvFgixOfPhxlQH/C2zNaLu4/gR8IGMTPc8l8JXEStElCxTnsQj3HPUzKRJPnTyeSkBMrPLVMHjWI4VOnwd13jMnvnww6GovGvvHuLZrXztLPMBa+c4A4/mD5EtsaDwOV+MW9v1gw4qEKXLaLb8XgoGY0KCix06G2QoiSngA/FTEszZso4YK4D06DUhJYEfFCEbD0EKMolFAkgEKigUg0FMKhDU4nWO862AHYUcMAgUoqZiyaDQhzzQ/F3Ysh5hsK4RUtOkbLuFVeIcrE9JRUxKHFYwyYQOHZMfnaYyTX2p3cfklJOk/FJeTv/I03/ki7/3+vf+pctWrB8EXZTa4qILfPz6r798BBxvzWK+R4OPHC12l61WtQYk3Cab+3M/a7G54NXXqwLzoECpRePuJSvApesVuoCQOUJ9HTEFjPi6RhHT+eu2omi4uXwAh5mJG1aKNJdpkjwDR9REzNAxztdyDhctgLDBh8sW+MilFDfp6+oZPGoM+AjXGg8Xh4Fpv8f69ha762vZRhZjt1P/edV/3up+vU7+c4vDRPKfXft5K5Z2M1hI8rU/0NUP6ut1r9ttn2b46Py58VrtIwMSz1dN0mRGTJNV8DidbCoFvwV8NFE+4d+hzJYw5tgGDqrEWdR0xOTyuzutMz+ur6OYPGpBav1HZEFqRqTvk3zo5OVXrCpYtmBV5zz/jMdj/Izk4WDmW9WmcUTBp5SINGiaFlvElDCpJo86DQP863enX/mVP3rART+aIgTvYgPDdd12Neao99gHbIRTqfCx1UmvfH3Tl/4mulzReGVmNw0+Xh0nWlgCCGwv+1WHTpf6CyHmw2AsKCVzHjIYhedLm90cGQB3DvB4wWi1W8foneLr4SP0SB5tX0+vX990N8Ou23er5If/2Wsvy0wQTZraFHOdb5YyZxltBo88Ib57+Bgl7/loPqjPXo4veZgOYXs+PY/C7fLB9MH4G9NvvPhV+9VnheUcNdDg4ywbUs4fxSeQ+RHQsJKlFkTQprCLq9XOQP3waG7WzBGmCQITSlwLHMvtfW5ro5mhuhAkIKZQVkuNS0pXisHC1mJBieuobY7PBzgmFdGI82uRYEXq8wvadHRWazhZSgqNzExXzwMJ/XyGEUnVUCQ/FBKH1LWoiQjdRVSKzhiTKQzAfPGf/SP/2REXXXQBkIu+/6L8VX/V81uR8iiKzaPN7ulU6pDBcMCHx1rjMdd62G3YDBucSeSzUUj7Gvt9gw9p8BFZkLTAh5vVKc3zO1TZrCImQPs/TLbtUKUUlhk4YEvMr8BHyXkGkHGE5ay+1rI454KybLuCCmoUoamytC3aZsVyNpumiGHjQ1crMqWi0bHr6oo+m6N28HI7P6zF3X5e7dz+8z547mAVlshqqK/FIUMj47Fa9eLgoQ4ecd7F81erFBASsBISVysoxTSRcS/TZFFDkj9JzUcrPP+EE+v1FRDBbIirrv1nj+nlQwDI9XWAR5dmJ13qQAKukJI2APkY+NCIYgYu8OGxZnZwOgWEmAMI+fIly/09MolPJBJNAkjnzgEdy1T7IpJ8TbfkAJHVSsrd3d9++tVf/aMZP3q6ZD7exxbE9a7sdrHlyibbVvDIabsu6/06r/fXdn33pDx5cmu3r93w5snWtk9Wtnqy4mq3klU/yJB66ZNSRRqY+5GQdI11p9CF2EXhMhjDGbXI3JYajxKOjk6eWRgDPHy438v38f4xZnUbjPgIDRjSW/rG1V6vNvtuP+z7XQBIhY8Ajy7Ns9e1Ir2gZRitWOAP5pnqIxw4AkCswcb9WOHDzuCjPJue5Wfjs/zO9M7xL+S/8MEH9sGIJrrNaG3d6j0+JXyEFriQla66yIIs4NQAJB5TNAmkff0RYwWMNl9FoQbCrP60xQosYCTP2EWbK+SEBssQWMGUcwALcp4wVWdMU4GZAEwytzn2A6ICEXeq9wVNYr4glTS14s7t5xDKDB/mlgoakpjiPNVI7dRSrJMwMKZejzjDCxKXGU+EwKDIIiiikg1mCamUvsh/7Y/+197DRRddAOSi77d+/uf/4BPSnpxOMWiwwYcFfNSJ5h6vH2o97M7XN2ZY43OToP3h4NG7VzN4oJ+nlTfwQFrAo649noOHAq0egK21bZ4dQIHisUR0B3x41DxDB2r2o2Y9pmo/r4+V7NfNwPlDPzRqFrZbRAbDYcLEYUL3eyZfd9ut9V1nmpLpOFqZplI81gzIalX6qyus9/uwbB1ENpuN+s8pQwBDgw5fDy3bERDhMTUASanWRNAX6Ptwj2HoYp3CXScR4zX9Ah8qi9pAxTk7AJsmZo+f8AM55ZP+HS5AIuQcluvLGlAVidoPLw73qeddH9mPq6ua+QgIqdmPqGU5y340f+w8AhIshVhmgGAcLQAEnv1g+PnzqHeBmeGTbDd7VUJSVCWHFxiJtUcZ3ZMqAnLHX/mVP36Pi3604OMO27vpLuZ2bMtU4SOGCO62ebu/KTfXb9qbj57YkyeP+fj1LbevhQM81ly/vlNPcqbrTWQ4otYgQCOKpgUCgsySqaLSoVODGdt2Hxa2bVYBHgceaq7hnvejd7c6eE3F4QN8cO8++rVcpBg+RgIRz35s7vSuwtBGNqttt0krXaVOarmZ9n5E1BmOhKwZD+SSlwqTCh9WPR5rtmPJfNhhrOvyYnpRno/Py9Px6fTe9N7pW/lbL3+1/OqLgpb9MBqX5RzY4uJPLaLWeGj8LElazZioimqsXcKWWaor1jqOZZsaw0vnK4YhbVduQEgJ7JpOGCeHvvHEpc0xjmMUsh89xuPuMZ5TmLMivlonLrZtdZIEsXZBKmeQzSZmIoIGo4oZKmLdtl+5U1un5Ty5lakLKEmoa2g9pMKHiGQAhQnZxDITS5FSCgr+hr/7b+B/7Y/8157joosuNSDfR126XT2JWo8oOPfsRwWNcWzwYb6Omg/6udUtV1H7QXLA90jrNWrNR98/TCaPGE4JAR8eG3SETUiiTRC3qrlOohSEjfWyxLpGsxotIomInLfvCHMWX2sxU5KCvq9F0mm9RljWazohULqOc0mgFGvTw49Hs8MB/YsXyP48/da3eH84lKMDynq75SrAKrxet0LzcM1sdCmptgxHShLyqLIgBFoHK7cvlCJq7gSoYFE8152W/xdGG2VmLtZQLW5ftKzGb/VhnPiEanUixjZGC5BWC3LWEln6nmkeCAnpunrPHhUpiVvF/Sp0fFwNSHVKsgCLSUpYzDpwsu8DHOFgixVcDiIVSj8ZfDTJqhRsVHkQsU0psjXDNjrBRS2IA9Px6kqvvBbkudeCnPAjoUvB+U93P719b3xv32u/xYTdMA57zbp7ZI9urnl9s8Putrf+Tql3Qrk12i0EN0XKNRLWAMRo5ue24WZ1tONp5Jgj51BYah3IxMmeybPTiqvkMDF10h0VqgElKioTptJmRpx4ChQoBTOgNPb/rdSj11tcrwcZOoHKaCdxpJFjd8I6OVj4+j7dIyERhBQzBnD0qWdrt1uLzkuO6zxNdfsVI/tRMx/5YC/GF+ESmY+Ym/Fefu/46/nXX5xwKmjwYWfggbZu/u40YbIocN/Zru+kW7YpuSUpAIoKQNT1wEGzH1vb1hnoWbItt1FBEMsJJGLLpc8/e40oRMjOMyp1DaEIBXbg4dCzj/uQzFwiGk3d9HNRU7aqRF9DRBIERdhoSUTgNpmzZRRNlmKtYqL1eYQoUsutdACUUu/Psuj86zXRUVQmZp4oPCLjSOVWizo/4e5//fx//exfcvUveYGLLroAyPdDlwnnsd0KmK4Ph1pYfjOOeeluFbUe5cbMAkCuPd5FJNn91t2D8KklAkQhdt9LQMbSXleWQnN4ZB/rh6zHnPE46zbVQCLPRd++LFId182kZj9aoTkJm+EE9PMwIpqpidQOTGmeTyHdXCwNDQ8DAj6QEgmYu2UVAj7EDV0+YIsI1UFkTRIBHv511quVLBkOtJoObQAS4OBRPIqe7Z7ySCAVtg1gSMs7JkpCPbIlBZbCdSXneg+AZgYhGefhOHfTJZ8XfIibIsCHf00uFopQUgqLG9JqOOZzDdfzcwD5GJ1txSJSMlEF3PH11c0ZyBj1QyXqiWZIkjZHxfDJpWa2J/VAyrEUbqfJdiJ6mKay6TrdrFbYPX++vgLwIwAgl8zH78LvWo8cd2+mN/c+tm63mlY7B44rzyTcXeHqtmd/q9RboTwCEb4N8DDaNRMHoWiDj8JiSi0CGdRUKGeJOAGWLlZlKToWg7GBhULrql6bJSqKTwofApEbuV6vZN0ndLq0+eV9fqmHacdBB3bSVStlbvNbMvquR6cdVebkcmGZu11NI2Lk4f10aABiz4++7er0LDIfMbhvfHd89/QXp7/44n2+fwSXtr7z0XR+RnxG+ayL6cqu8lrXXZIZQJSV30DSFKpuQmYYc6eoGykshlktAyEuhNpEc4WyS13AgwkFZ39vITExKlRCcY2gRVZkwNAZrJCsIKFQeIRQJKKZCWW+SYGooh7iVqGfN/hginW9JuaGiJp6hLRslQn7ImUtlKzUyWN4FJMRhqP7RAaEeBTuJpkOq7x6QvJeRAy/fbrooguAXLZdvdzHhHOzyHYEbOTrOetRdqXYlVm5AexW1e5SsihI35shieDV2oDPRa3D1dzRSlSEiPVsyHyOOFeAKIXWtlu5WQqKx4AMM4NHaS11Y11a3UesS2kwUkEEHsUNVXVQ0O7mJvXuLuoT5pkUSA4PC3wAqgYRowholqQUYhylAsiLFxUA8nKvsX2sHI+CqGOJGo+IAVnu1HUBIDWm5QN4cjf4gIg2U6RChwGJHuFWd/sUoyLLRUWCqxQKOZPGAh5Y4IPh+Pn5sYRBfHqJmxCha16TaBAhAGW5JiKxrrDQIOTVuo7qT6qlwJ1uBWAiVDdVLami9H38XdDMtMEQDgeOJKrat5z3PUisQTaTS9ZsBeDKfTSzk5kezLDxdWRCDn2fDnd32bMgT1/8D/4HN0f88Oqixxg2srna2e7qNJ52N3az39r21rdZ3W25vUtMdwBuAzwiGuwuwEMo1xQOy6RxWAhm2Y/24RYKLMXO1trHnsEFTNt6Vnvsu4EPEIjakx33Q5JOleICCkv2rEXxeo0uwCNBDYCYGUeLIvMjI/uRUgeFUlDBBFOZGI7i88iCBHzEFqzIeoQ/GD8YPWMU8PH81+3Xn2dmLvCB8PKn4RxEPicdWNvNpg5dLdxePvIvDa3IVntjMEw6WWRBIjvTtmeFG7ApFgh0tcxIZ51SiLjeWvGeQ4u7vQbLNBTbpI0OMuha/MA6BZTE85VKEAWGNv2+vUMqaFUjqLC45GOkZUbUFhiJyx4hCy4ZVwWlqMoMICZjmOTJ45GFWyrvi5W1me3GPF79D57+9+8AvIvfDl100QVALvrGN56tU8qPzErM+biOmo8YLmjGPVmh41Hf88aMj8IiuN5u0ZUCmLWsAWsBd5zjM0qEsgzbg7t9OJX2AbkFgK2wHPM9tA+GDLgIt8zHAhsBH3QjistLXBtHnVrNx5Ix6FTr/In+7i4Njx41+Eh1Qvc8o0K07wM+5unbqgK3AK3zUhQ7J65WpczZC1EACZAiotb3jGtpAY/mlv1IAR4t6+FrFVmIC8l8barqscuxBpSYJeQcF6tqXKOamcxQ1tId7e+rxjLDmhAgPkrfXbE2uCwNQHp4BvV8KxYfJA+AIhSZDcwQ8mk0v66JsmDD8iWtS4nse5iLgKI1vgxgVUWFv65D/fsQgbqbOL+XtGmaoU2VR1U5zeAhO1U9qJZ7j5uUsDscuj2AH1YAuegfQv+z/NmrJ3xyPZ7G/SqvYuh9ZD3u1lg/UugNiDuBPArwKChxfkvwqtd+aMXDFSzEWKyYqtrC3HNJs5bhJ7qfuHvP3rt/394/jDKawfjxiQxQobH6ZCIgrg02kRVYKt9Flk5QNto4vpheaocuLs9pYSuYbOIxDagAogmV5JdUah02mCdGEXr45fSybrvyOHn2o0Tm49enX3/+F+wvPHsFPuIwCPi9gI/2vtYkMlLqpEKI+BoiQhOrFj8oTBOngAELKHjJl5OK4qwxACMmSQ8ToyDCRILz4/5azcj1fYyLLfuhVJqYJD8MczvgK7karuW6X+s6+dGllNSFcNFiJmYnzA0GQAhBhUQESMoMTlWiiLXMZiu4a/fNzr3OViaITKI1+zHBePR47Kw7ZMv3GfkwlWmzKquNqt7+PR/8PS/+9bf/+hMuuugCIBd9b+Hj6fruzp6UMt0ejxZ1HldmYe5Vy90w2GMRuzMrj83MzZuuwwBg6eiEYhZryccjCchn3Ya1ZDYesiqzaR7TnLmgicAAFveyfSgW1csH6zmjkXOctyJzBmi0QvN8Osnk58vWG8EMBSqPH+v6yZPOuzIFhPSeAdFaFB3bsBw+pO+xmFgyIAIUISFmymlS+OMmojIPxFPxax4rDAAQkNCua/ChEZe6FlHVVu+hAJQi1SaSwkU1FRENWyu4bhkFUmpcyhrVLWatZSbb+xEuC3z4tVYH+tnrPs7Eh4LwlgVpmQSwdcuia7k3mDEUER7Cy88j/LStnReYYcT2HrRHRKprFzWzxrWClCTNWTBhSmh/H9pKTlqJiZm4ya6r758GkLuPAE8k71sWBCj3XZe2kQUB8A5+KHWp+/jL9C+7+qJ+8cZOtt/Y5vq6XN/ubf9ow82dmNzReCeUOzO7gyEyHzcKvVLVIc2bCCVEV0ExCUEEgJkYO+nYS2+TTCkK0ze66QvLaLSGGsQrWsBD8EnE89qPpCv2SUUEBphaSP2okz6O+TA9g4RAM0ycuC4nWXUDk3YVeJImGg3upRlw5tIFyzyLkh0+atH5u9O7x78w/oVnf7H8xZcnnMxoBgMafiwRNX4PdJtuNx26LgDEY/KofkBEWi2HZcmEAQED8YF/ZasuAKSwtJa6VQAesiGiWOAxToTkeWtfjdd6DMPUpGVaIttxK7era73u9rqPv+e0TdtuSDUNrlBUAJkC+WRKjnR2b/c5M7e6Rl1qVwRz9qMRB6TdHiMuyzjIjrSN0eJnmkBkGHY0HGncq+l9yeU+D/lQrEQXtyMEj3+Bv/CtX5RfLPht1EUXKS76sdJrr+mNSBSWl71ZvorMB1muVqvyyP1kvbYnfV9eGwa+7n4c+9pjUN5qxd7XXRsMGFtaPq/hgyRQCuiqazOWsw/NZiZ1HRDhnmYz5josljGunU4RZfTzev14nNeHA07393IKAGnwkZJ0V1e6/tKX0v6rXx02X/rSsPrSl1bDF74wrF5/ffBMSNfd3XXJ3S1Ot7d9iuxIdG0K7/cBKho1IgErNVMyDJLa++Tn4S5igMcwhDXi2UwPVY8NPtCgQ6TLquGU/TzikgmRMIGwQgThpcuVIedCt8c2bZ3hMkdkd+t+xc+69Yr8uBeJPTyDVYAhQinhVjvTzmeGMPvu+MeseqlzMbhlcSJLErGu6+qWuPbveFiaAqy3W9nEep69ol2bxTJH8Yg+4nqt0TxgSAkO5bzuOuxT4hVpu5yxGUdsci5e55O3DvqP8cOli/4eyE9vf3r3Nt6+ucpXV1fl6nqXdzdP8OTxNa4f9+zvkqXwYzF5AuIxWWHkppNus9LVMOjQV8vQte5SnR9tO1DyI2JYIC2iSsCPgA/5NFmPcyk7aeXfGaUUlhrrBHbkErUKh3KI7IU9HZ+VD07ve+m4o8TBe1gd38vvH9/P796/W94/eEm5O84jvnsI3Hj39O3jt0+/cfiNw68ef/XFP3r8R9/1jlfPoyTdzIhX4QPfQ/iQ29Ve9usFPOru1l77uXmidN3530uLa1mnNdbq7lpWyCOalr+fOFR8WeWh1z65ddC5rfJKV3GeOlkO7WLLVfdYH29v0k3XfOvHdbqOs+4qXaU4v/PjkR936S7d+OGwMqyxFqE0CBHMICLiRpy7TGjQJaPU7JrzPOw9boqVTUQz22TL+8mmbS4eOcX2q+2hHNYjxt1UputH9492uOiiSwbke6dL0fnhZpqOV0DZ5Wzhq/gg1ff2SKS8Bthj0l6bMx+4Jblp0z3MYCkhBRCoIsPV95LjehifQWay1HEEaNQtU65W+4FlpgestXdllXAuGreIrcbDLcuWqwYs4Zb1ABp83N3p5otf7Dee+fCZFH0fkHFz08VUboeJGO5XYULc2veCriPaBmqXkHQrcq7wQI8cR6VDjnSdoO9rlJRAX0MV+rD1SrpW8yGiBFrmI9lstQU8IpYAD0A4G3SJG2HgIZNQiokb83sYxhLbe8ESNgM/v61XH10L0kagz2tZsh8VOuwMkFgK0dw6kn1KLa83epRl7bGoWb1GEbLr5nsRl69tyX4AqKYqJBQxTAKkLPdkAcVFVWUuPpcr1ZoFOeZsL0vBfc76MiVsyLRZr3N0xHp5mY7+w6Ov/66v779kXwrYuM0l32TLNyuuAjwekby1YpH9iMzwXZjGW6FcJUmrZeuPimspGjeCkpCEZL1WRZGkyWM7JTIzixQqH+oOzovPv1v4aLUIJ4ylwyl36OYWrqKSqaaWC+bMyGg0G21KQ67TSpCkY6+9qCgEWCauZhY/YnL7wY8X+cX0fn7/9E5+5/BN++aLqMGIxzEf55PNm4jvke70butA0AUQJElLFiSpakKrKaPQFGowoLB0k04BYGXLbR+5nGWKOeWV4bii0mCkxjAEXOhK6FIojSbuuIKNbPrr7jqc9nF0e93W/MdWA4G6rgsDCikocsJJ1mVtPfrSsetflBexJQvGQqNCSDVQdMmCyLIVTFQALFtZG6KAycxWqrr1OEKxgWGcMyF2kKL7ok6dNh1ZeIqua/tp/8izIPeeBcm46KLLHJDPWZdJ5/3z5/dPyHwTrXXNyu0wlEebTWQ87ElK9kSk+jWSd6rYLUP/lo5Ocvarula2F+dCs3rOzzKUMOCDZC1GlyqAbIACtkLznGnLwMBYl1i7ywIckQ2JTIhnPzDGOp5nBgKCcNdJ51O4dz/xE8P2zTeH4Y03+sEzHv2jR71nNtpAvBQxshuy3SbZbGp2w406C2QZijhv6+ZMT9NUHD5KHX63zKBwE9MEjGM8F0vR+UPmA1CoJng01QYeXXFnt6WUiruCCSA2ZwiEDcjMiHApxW3aPtAv9jXCuc38GEeMp9Nnz358mheR8upccVGF+HvcuR32xN058MX73MkwqPR9wmql+mmyH6dT4eGQcX8/uXP1y5dZXryoMaBHSGAGDFFXjfF34fYYoKlpdgBiPBZGmoFEUrv3thFingWCUUQyiRPAKfhEBNMwSDmdutMv//JlOvoPg772Z7+2/r3T7338Zf3yY0686ay7jS5BA4fHanqLglsW1oyHFXtUrNyBuFHRVSddlyQtY/w6XWoHRDAfrcg8DqICR5k4VXv72NNzPD8VFEIAORPks8FHaP5+xQ58OcX4wK1s+oRUIQSzKvQU1pkjdrQoTT/YvftlfhlzPfKz6akf9c/87und0zujA8f4zXuv9XjmQwaffoffOUyceL7lKhzH9xo+FCp77IfH6fF+o5vVOkUWajX0WnMSmpbxivNPnLQVi0MIhlAjjjjGvA8T1EOXuSCifoTi3NfqjgOpfUU/PIi2Q1VCe92vX+9e39z2t/1+cPzo98ndbYet7vpdcqtfl0230bolS/uA1eoGOkar9TguQYhYSljkLEMjKjPcIlSDCKisp1CUypvCTGWhYoQgTzJNUEyiUpap7nZX7ux//kf+5y9x0UWXDMhFn6e++c0XtyJ5H1uvUirX67U96jp7DPCJWdieADX7cZcSd8vMDZ3hAKZKiiC3uriczz+MfT6a53dIEaE0yDEjVbEMlIrr0rZpGSloW7XC09SGCrKQwofMjCAU8PHWW2nvmY91bLN6/LjrIvtxfR2wEdPEazG6xznz4ZauA2YAo6i2bIxUsGhbx6apTt72GABgAQPwa+bXwjATURUTAUWWL2ECEQWprdaDqqnE2mOFj/m6kpRC1/KbeHh0U+drxV2FUkzm+hzmBh/j2OADDmbMH52tIsjPY+tVqwGSJfLV1zLem8Oh2PEY0NYVjymALaaWbzZcBgnCAvbwCeRQZfH65hkAS1hyNinL9u653gZiBiHDQvfycyhVRVr3XwDS4DclaCkRqTNgqIyjbUWwB3gvYgdArszkRc62AWyTUvaYPAvynmdBHp3wA61L3cc/4/TPuPmp9FOvORDUzIeZPVLRO483ueQKH0a7jayHmd0CuFbRlvlQhS7N+wQuYpYUFlnOlwdIM2McASAv8XKs7Xc/gwQiH/HhHOZHRjaByDWGZDDGHJI2lC+OxE4FWcB2jwa2+SUs1uLJjtNze3H8gB8cY+JHfN35NRU9+Om7XH12pfi5JOabtOxH526ThCoQip9DAFLBpasUWrUECiSeK1n02/btl730SpBhuJYo5y2/WzYrIgRUqlCI+l4t20x3suvWaV3BYq1rceTQbef4lzYSMTaBrfoVUpdgMDnaUf358OcjIbWMiwjFHAMtL6ikVPUYgIRQPK6gCqRBSItqsM7jGsRWoScaR/eVFTtKkkMp5ZgljwEjRzme+tzf/Fef/lef/76b33fARRddMiCfjy7Zjxfb+/v8GpCvh8Hu9vvyetR5pBQAUl6LzAdZIeQOwFUM2HbXaePLtiNtHztJcYMRc8ZS5A0jhfiMesh6SMRwa3/KUiRirWdYtlWVpe6jZTwi+xH3UuEj3LIeoZQi85G2X/5yv3njjaF/7bXevep9GrfXc/QaReeRAYkYELLdagCJOIykpQOWzvc3TzQcx8Llt+7F31u7vy/l5csavRVvsZcvI9Ifq4AEVVmkApxvtQrY6IpqOJk7sh62nC/wIbYU47vBOethOKv1kIjtvVm2Xi0wFsX3US8zX/8c6z4+jaT9PTQw6fuAPe02m3iP07LdLblVuk4DFqXvRUXwsQoQdJjhnPGYfJ0ZmY/nz2uER3Eo0eXf5zKssGVBRBbXbMfcCUuW+TMis9snS0ioQfDDdHScRDAByKXgaCanrovzNPY98vvv98c/82f+6BE/sLro53//z1//df1f9wUU3E15ukHGo2TpkVJvSyk3VuwxjbG+K1YqlAhkG5kPdxxpqe3QNtHaWA8rnOstWobBjxIAENPNY5r5O3zn3mD8JJAR7tDVmoUttv0Ou+FKrtZXrF2W1n7ex2PL411r29pmisT1Hn1qmRa07a0oLDB3YeZksS0pYOO+3I8vGU12X5zes/fv4wP6u3z3UGs8YAAhoNHw/YGP0BqbqJ/Y7HS3XumqX+kw9DpE1iP1yd0yIHFImlMgEEprc+6K62tZ9w4Nm41uhmgM4Nc0TCFaIbrqUsMzHxCV+qy4Lk2oh3iNx8qL4ldX/VUXmY/dsNNNv0nbfpsiC+KZD4no5wEiFZVUlUlSAw9ZslMoLAGNM4IIgQciIlqmzdX+hIBov0QRzOcyZ0JqTB6BbGoThVlEwtahK+thXf5nf+R/9gKfXRdddAGQiyj/lH/K4fXNJj/a7cxdXh+GGT7IyHrwkZm9Vkq5A+aOV13HCh8pcc5DC/EwWRswQ4OP0rY54bOrwc1Zdyvhss3K5u8113ZEsfkMHXOxec5YppzTPgRqJODj9lY3X/nKsHn99X4I+HjypMFH23bVaQOP+UOx1u1WXde2k1HMikxTDvBwB2xMDhq5uB02Wizl2bOwTe7iYGSkQF1zh6VEt4UDMgI+ztZhX/c1klpIKXMRPsPMuWZaMMfCcYy12VxX8bBFrb1fi6c4J8HPESz4aWYUtvqdOQLimuttNODDneDwoSklBIC0yeZ93yjyQ+HDARABgAEbNoNIgf9d0MEjooPIJGbnv8GsUhfcklK1uht4aNe19QwfbQ4NIghcrQYnrrAsADKRHM3kCMgoIvVaKVL+yX/yD94Df9Lwg6cLfPzZn1//M/DP+JJSH5/K6dayPYotVkKJrMdNKeUxWeGjbrsKIIFgt2y70g5dy4Bo6yBX6IcVy8zFbZMf2eq2q+zrfIwP93Z/+hX7lXc+CXyEAh4cMlbutUPHaie7iNW+Xm2wibklq6iDGDC0jEw9JkxGEEmSeKQss0WW/h5xnzN08JgPOE4HO4735uDB+/GZPT++7xmPZ3x6cmgqra1uFesZvi/w0bZfyX7wwu0GDn2f+m7Qfi5A1z4t27AqgiyblQBFy2HEoUnqkTpdCtalFqynBUJkabMbFn04tEGn4OF6k6PF4EXlQ9SBxJarqP0IAPF1hQ7/24pzqQDSraRLXYUad40LNsBoCAW8ZmS6UA+i1aKggUdIZgENP8j6p4iYx+wuBE1UCoWjqWUVLQCKdlo66fhv+7v+bcf/wR/+H4z4bLrooguAXLIff8vVW2+VN9drPlmtyutdF5mQCh4BII9LsSfuR2a8VcUq4COyH8vEcWnbUUiQbC1v5w+4S+Yh+7nhQyTy3UGImbANyzsDD4+S3dM8TPBhqN5HfbCWqprF6N5+u9+8+Wa3Cvh4/Hho8NHF1quoRWiZj/VaW+G5q00QN8m5QgePx1Lt8FFevKgAEs6xfvYs56dPZ3/wgY1PnzLnLExJte+TinQU0aLa2QwaFT5KSuG4lqzr+roGdJns/gAf0xQAYnXq+pyBMTwUcqO1HXbzvPB8qYPhZ9569cnrPtpKzjJbrKt2kZSAizQMc31NgEDXyWIVQBboVbSicCwqBTyd4ACIElmPyDYFhIQdOBh1Hx7x7NnE49EEoCyCe8mAqMgS1NVA5GE2i3Tnw9jF1YYoujmDOMUMRQSj+2QWwIEjiVFVw9MwID96tJ5+9VcvWZAfRP2H/6P/4bdv0+1bYx5vxzLe5pwfwXBrZpH5CAi5LVZus+UoTH9EcJckpXCHTluHpCXrgRk9atajtIxHtpx9nU/miMPTdM/78Tv2nRcv8GLExyjAZoVVupXbc9hYLV6vZd37492y/aiL5y81BLUWRSDIyOVe7jOFbLAzYiwHHqYjD+M97qc4v+fLMexbrMYPzLdY8fn4DM9P/rxaG2EwQ4ONUPsPCuuVssQQ8dsk+hFAdp18R/FZB7Iush4SEFKhotqlKlJJIlVQULTajSWTkQQiC3SkeD/daQE52JLk1/Z8WbZJuURkvh7RVwQRr731MiKv/ugCOtwRAzpq7UdEt6z7NRwZpdMOSZMI6tei1JW0bFqNJ55s9CPWIMLiiqgkRSDVgKi0Br31FEKheSwiUiJSmWsUTgRzJ10JEElI2cTkf/5H/+dP8Vl00UUXALno9/2+v/kLXVfeTCk/ie1Wc71HqZ1cpqkEfNyVEkXn3C5F5+GAj9TKIFttRinnUCA52tweDjICID5/Cc5EzuH8YbrOz88fFlGZ52sg3d3p6q23utWTJ3O3q9vbKDivRdABIQEekfVY4KN+EG7gEQSBcSyxtccCPCI6bMQH3wCPWNvz57k8fTo5dEzT++/n6d13y/j++xZbwywqzoehS0uxecAFU0pLliPF45bmicOxdvemqq3g3EI5s221qtmXuB+/F5umgJEZPjz6OawV5C+1H9MyGd4+j6Jz8tO/SATt72peQCLofE91QnxySxvg2D7xRyRRXYoyZ1RHbcjhEJkPKzN0lIgBHf53EdBRLODD/z78vKAUiuqrG6TjQkttiDbN27CkbbmCVKH67P1qs0uqFgiZ5pkgNeNxMMNphhIZU0Jer2X65V/+4/fALxI/MLroF/6JX7j5avfVL0fGI7Ifp3y6i/oOd7QpD+C4M1pAyU22ut4rtEtI3VKkrG4hWBXQUQEExTJy23ZVwg4f08gxMh+j108cvHDb0Xmy3yrj8UgfbaO9bHgr28Gho3olq7qdKtyh6xbwmC01akQHjPGAQ24T1eeZE9mOOJaD22EoP+fzyWFoesGX2YGjjBht5GQGo+t8g1W10chGAPzed7n6GECTG/WtZ7oLAOkjczFnPtrWqz4lrXkQVW3TykGotHeqZTXUXSEk1gtgxrWa4Wp1Pm1MlUBC2qBjOYdbI7b1TXczXHVXnWc/YuuVhmsGZNhKeNWvavajT30DELbsh4sUImS06myZBzuUkZORJiEQ51qwpe0SjXiWQRYYFBlSbQAmE5viXEWzqGSFmq/5r/jb/xX5f/lH/5cHfDe66KILgFz0//h/3N8cx+lLoD2ZpqmCB1nuPN5NuTwumbc52yMy2vGiD/hIqcEHdSnyLu1D7EO3qai70ACQUzyG740EHyv7kKdKtbjmwnXUOoI330ybmHDusz1iynl/dVUzHp756HXJfMh6rUvWgwjSmqaCyHg06JjrPKYKHLF+/ryuy/PnxcFjdPCYKni88045vfsuHczUNpu+X6/7vg0YbPARsZGen3vs2fczgKh2AGSp9WgZDzb4cFtsNXJHFoStJqZmPM46Xrll+rjsEMBPvPXqMzzvPAsiC4To+eyXecsTNKIbMosP2TBU+Jqm+PnJ43H++R08GNEhgwGCnn2K7EeN770Xfz8V0rBkPxpQnKuBTrht+apPxSs6y3642RxCG/g4Z0B48vUpZzkGfMztqrtRBOXnfm48OYSM+IHQRV//x74+/IvW/6IvrWT1xpSn2zGPd6ONNzQGbDTouJnKdDOW8a6wXBFcNegAEdEDl+at9U8rDGe65y1YyLZkP/LBDuNLe3l8j+8dnuHZCR+hAI9bvd24dzvZRaVAbLHqa8ZDVm3GSMBH/a1/rDt0qUGHLHhtMD7H86NAwFcOl7qlmtWKUKxnnc/xqGrwcfbo9w0+QgFfN3K7rtuvHEB6GQI+FuToUgBFN7vBAtEAIbRkQuOoEZo8VuBYptlrWjpntWhi1mpqGsC09/wcRYoUOBgN+7QfNmmT1t1a3WnJfKhnPjTgo2Y/UldRUvUBIUmGsahu5mtdsRxiS6GBXPjirDNvXbULcciSsBVgiZnClv0oojK1bEiSFCBiAPJOdvi3/LF/y8v/wS/+DwouuugCIBd9GpFMv/xPHr9seXr9eMyPcy5P3Hel5LtxLI8i8zGf221KXKeElJK5UQGErpzR5mu0D7k18xEZkGhzezp99ParJpHPxB/yCXYBSQvh819NwbXdImZ+DLe34uChXQDHZjO31nX7WqLewwWYmSz1HfD3zOaC5snj7GXLVZnBY8yx5SrAwz/wOnxMFT7eecfGaUrY7fphtUq9uMx0yW6kAA12XXOFD3u41kNEzazeC+cP3nRX+IgMTHzwDuiZDgdOrbtVxICPOYqdg8fnLH73kCJn27CkxmWbHcWVUoOECh1SirAUcs7ytC5XAR8NQIxz9inqbaao+bAPPsjmfw9+HtviSrweLYu3JFZcKougvmxuvwf9aPZly+K0zAdLCYM5W5yPJMeAj2niKdaqOvW9jiJpMhO7ZEF+QETIv/Plv/P2K/qVLwV4RPbDY2y1uoqhbFN2l+m2Achk05XRNiC61nwAhBpMjEVm+KjZj6WQO5s75zn7kUee8nHuIHV4n+9/ZOG5QCS2W3nWY+cQsolZEu7VGXj0bWvQgPm3/Q083HJeiNwqlQbUYXnaodOC+QDR4EOrWddyDhoNRFo0GugCge/XlqtXNaBPe92vNrKJ1ru19qNuvUpd6mK9ZDL8SKqtWqNlWIUtK3JWYF6T5h6rzzqb6fngSGv5T2E9V50fA7Dg6byOvycvRu8dQLqoKfFDV2lVwSPs53P2I3Vwx52iSVVrJAmjIY5sGUYitvId7WhwCUCFkDKvl2vQhY+XexGCDTXNnYkZOoqUyWP9b5VIzYCULnW1YD2VZP+TP/I/eYmLLroAyEWfRv/Cf+HffH08TF84HsfHx2NxAMm3ARunU4URhw9W+CBtr4qW+VARytxlCRbO+XywX6ylHA5ai8D9mjUA+R5JPvqcEIG8mvUIP9QcEJsN0u0t+t1OItMRcyci25HmOg9I19XXYZrmbU3H41Q7WwVwBHzM2Y/YcjWaQ0fAx7LdanT4GCt4OICM775rpw8+kEL20VVrtVp1Q84iOav1fULXdQt8JPR9b/N5jwU+EGtV5fzh25b2vjOEjKPZDER0+Ji87oalQYZ7WQBN5/DxOWY/+Bm6m52J7YMP3dLqOVKCLvDRsiPIucGXYYaO6oBAus1rbUrzBx8Ue++9AMI4LxbgJlUVPlyyKFYqs+Vs3epO5KPeL4k41x2Zm4gQXoY/Tr4+Rg1IzgEgOqrKKKJ57oqFvFrJ4Zvf/MMTvr+6ZD/+jV9f/Uv1X/ploTw55mOFDfd1ZEA87h1GriebYl1drOwAdAQFhNAoM3wYitsPZjTw8Fcyl6kWdY/T6I544GF8yqf3vvXqfsJU8CEK+PDp2bsrvVoHeETmY63rIcCjAYfHrv5XQ7qIKUnLGz6wM+OQahosjAlTxaOMzBk2XoEPQ6hBR4gRwwaLeF7v0dRW3y8AUX+vAtCGBh9d4IYsdR9ziwntFgARVaoINFX4aBlQCSdd5nlAZ2FJh4ZQXVGjnbcdsq3gW+uLWw5kjgWFDkjDOq07B4+4p8AQHboZPDyqR7grfAT2LFmVBqQNQEgjihnmCTKZnknLmdnAxo1LooMibixAxBDQ8JJiQqMwV2P2AiEBHy0LUtzm5r/07/iXHv6Xf+R/OeGiiy5zQC76JCKpf+/f+/TRKY/7ccy7UsIx/TzvjGVbiu3NbOfeq7JzqzvBZWZYponbMszOX9bOUebfuHOaAUULftvVij10PhGbg4TVbcJZAAylcOkQJZw7WNEtdjrBszhE1xlyTgSIUizMaTKMY7ZxDCDJAST0GLUGASUBAZH9cAeM2OQF5/lwSFyt0mrOemg6HIykchiSqKa2/Qpd19MNhxKPnbql7zuk1FoPh8B5uCAxTQEgxW2x9avE/ZM4E93fT/j45JPRRVrdDnh+vwFU3/xmPrSMyDQFlDBFAXkMKByGLH2vsiQoxGzOjMTrHEjo2ZDYehVAEhkRmlGHAZ0IVEQBGAFImx2cUgVtnKMRSYj8lj+TiNANzJHazkvhlsSGtDWpbm7imlk+kHqvmjZf+MJ49ff//bwHhLjo+yNC/vr/319/IyI3h3JYj2XcnMppPdm0ccf5duK0zZa3mXlbWDYEOwikfRh01fVimhRkK2wD/TLy3G4XY56i5a7HEafpBefZGeKi69VtV0/0yT7gYyWrbi3rVWy1Wuo7klvcKpCkrZk0WhdciJsUxqklSVpYKJBOKAaCSsWcE/TFq9mOJp5dNVQZjct1W2IT8X3WPQ7ZyPl26YLNJyAYAtu6Na1dIEGXJEHr+D6DWlwwMcmWReMo7vPtVeahiWBApcFMTMDUGoyj1WAgM/O5PR9v7GaI4Y4x6dyBlwfH0WiW7GZkQawzdH6oaBSkwyV0GU0rzlpWR1lcdSfep3u96Y7peX4u75un3htxChIRkgKp99pKISEUwpYGGuAgkDWAlYisTGzDzA2ArUKPnXYnLXoSkbGX/uj3swdxgIC46KJLBuSi30q/+3f/oS15fPt0mB4dj/n2NJXbaZxux7HcTKM9mmoGpDwCbBcAIkIJm5EPmQ+UpZ1rXta15e5sXa6L4RNI5HtVBxISSFXLQC/tuqxYSNV0vWbabND1PZeOSuYmAIOZcRwDMsIBGLGt51RaofnTp+Oy3WosUevx3ntTZD2m+bft5h2vYKVE+95uvdl0KyDgg0JGhiXVCd/rdVc9DL2sVr3HmPQd5xU+pOskhFIoc81DqeAxTYVzVqb95r+4wE//GeCzTzr/fEUBcD5TQwIQj0fUn28GL2Ie5Fi3X/FwqG5zViLL4X8fubz/fsnf/nY+OcCc3nvPIlNnIqgSqX6lRWUEBaCYT3Q5j3V1rD8U1kiD2RznLmwsHpdW0eYRAeaH2IZFIgOYUqpZkIjZY37tNTv+6q/+kQnfH12yH//2r6/+6fJP/0JhuY1Mx2k61czHKZ+u3DX7MZaaAYl4U1ACJnVprytuFCuYODHHgRznVsTNXAxmhgohJcMhxD3JlA84nKL7VZ5ngVIWwbWTXf+WvnXl8BHtZKNmIOBjOKv1SBGr0fVLUbQoVSAItYnecSZGmw1D3OOJpyg6z9HxymAC4sGobvDB5UCb2v4KfITR4g+CoiXxWjd9H++T9sv8jk7b9qsmFQ1RZMmCaDi1uov6Kg211lgQBVAtjStmE00CBlBGdLd5IS37IKF4PCa0uyP3kVp+Ztl6NVs7eGxbwVoGBJwPMTMGFOWSEeupBJRMfGn305wFaU+vsLHcgQhm0eIAG6CioEQs7myw0c8zhScIilCyiOSaCYFmVcW/ovwrPlkW5KKLLgBy0b/8G3/LdR7v3zgcp9vDycHjmO+msVyPUxSf50fZgSQXuxFgUKUClFLA821XHssDfKjNnZXU4aO14NWJ/KSg8LnXgUhbnHcpIo0uj4WlWLW5+j4gxFJKFFUDYBQxlFK3XUV9B1tbXQcNb6k7RpG5f8A9FQcQ95Tfe+80xQfed97JU4DHBx/QTqcUADHs98Oq61I3TdD7e1NAOr+eHDrUgcPdyWL4OQM8wv4aaTMvzHhWcF3crAXnx6P5vUWRdakfrj+OC0jwk2c1frufJy0SoHo8xwSQ0JwF9/e1rqUEjMz1HpHlMIdBxnwVB46cA/7efTdP3/pWHr/5zXL4jd8oB//7GKcJRVV0yba0+o+2PU8acMxqnbCkRuBV+GgiWiQrpC/kQXMvsTUDMMwAgqOZ5JTq3uocAKKKUUTydiv5l3/5jx4utSDfH/0zft8/49GX0peeTGW6OoyHq4AM95VDyL5CSDntT8Wjna4jA2K0rqDIjBW1tByTTdVGE4JQUSpmJwl37kSBkAu2BrZMGEuRUgGEIEJR3/GGvrG/1us6TK9tuXKnXip4zFkQSXWdsNQ1eGwfdD0qUY8AJDGYFs6QNHI0j8UBKLaB5TPokGUd4hmCiNHa1TgKzp/zA6Yt5qkanfY6D4ScC8fj0FZijhkwXHBTZvioMS0QklJqmFL/FEhYzmACJHEugTBiQSkt2xAXtS5QbbCaudokh6T5HrV7+BMVlTQ1Y2kP3iAGdJkZKjiU+d+fm+GX+T4aG2S06jrMOv+/RNZX0uzhq1gFEFh2T74OiJkycqbNLXlBlCJlJGnuaaWr4h2xXuIX8fG66KLLFqzL9qv/xn/nWzfPp1PHkodxzGuHj8G99vVmGrkZJ9vQMKSkakaYBXCQHm3pehXOcxSbi51lirhkQrIZiO+jRCAPcYaOlvkopdRzs/lDfGyT2m71pJpZipq7yzl5HUFXohbEJQC47OVnzuZwUbMP4eKZB4cTczM+EMNM40UxQ8RBQ7tSBIdD3RKkgCa/5tCROAyzHTyyAwfDfV+hhSlV+JC29cosXL83co7Ypq0HfDh7TDS8oh/C7Eer2zGyQYjBlx7BGYRNnj2Dv9cBE7Rh4JIhAt2yvA8S6wCVeQo/Ggg5GGNqW/GAlvJgK0L3KGWBEBVBgyeet9o9z4CQOI90fyTomVFLwZbkxsxWOctGxNaqti5FNl1X/HrefeMbT5/+D/4HOOK3VRd97Ve+tr6xm/3z8nzgxL6UsiLZT2Xqc8mDg8fg4LFyGFm7V8t8BQvwMJq6xdfIzFAR6dFj+RCJ1pZXBDRaysh2kjGtuEonnvq1DRAKJ8uRETEICKt1H6urNNd8zJO8a3vdgA51p8R5JqYiuVXDYtK2g7VtPyaUHoS5xV2scnFhng/4PdAlaCJCBrrllS1XM3pY+AcZPhQqJ5zyhKkY609bCvtUaJatlE4sma/DxUqr8RDMEoGwFaG36fAEzwEiVK/FgoloQElj75EljjnjlY0GMRFTg0LZXutzVU7X03XA5VyIPq3Uo7lT3/XWp17n7i9pxh7M9+TXEcXqUz/JuqxRO2jlje06R9W015t01X2Q3z8deSr9w/YzigCioMFETaRNTAfBBjRUdkodSA6WbDDa2npbAVjVa7A1Bx6hfp65+4WXv7D7RfziC1x00SUDctFH6e23/9Dm2y+ePz4evLhymh6N43Q7nfJ1bL+Kblg1C+LrYhhAgHzYclWKlAYZswM81I0pis7HMXmMGhDNH/chlfzeZkFEZquiwQfMwkaPXNZGGqapzu/IrgVKMgI0lra2S0elaSkwn+s63n8/Mh5jfuedafzOd0q01/XHwXGs3NFtNt0QdrjochaJrIeDSQfI4IDR+fXkrhkPj+4u1uZx6XilS+ZDQzBjg4823by2APZ7i3tyW0Hou85+8NNnNT5DNuWTv07akMvQkoWIc4GbZAAHbBwlwKI6zheXBYIFZ5qvESLaoKUuWme0JetR3bIgTa8WoTf4aG7zP5bCczdqnGfjWB0EOY7xmNwDdR+1zYXoyCnp1HXJjexwNf3Kr/yJe/z26SJC3v7W21dfkC/cJEtX01QLzGObVWQ8dh5b5qPGJfuhBQULdLCwIDTIIGtdY5M2su222Kc9tmmLuLbSNQdd1ef0aZij9JokUKWvAOEwULJk3ujN6kl6crXX/Wad1nMrWfTdMttjtnRdOCGFk0IUFCEohppPkcJ6f3P01cTJRo75yOPkzi/5cvJZHyeC52127Wy+h7TrJM8HCzb/AKpRknEru8gapaRLHkFDaakiV0EcLl8bRBgWERMVtm1PborLY6v4UKEIZkl1E0GCoXkpQOGc2TqfN7SstaCgZbsGHVRlPjrp2tYvuGtMS3F8+/qhwgIzo0cby8jw5D6Wo72X3zvFVqyAZMGMU2h/rS4jl4ybWfFobNBUvcyvzVGbdCJY3LlaOJGc4jkZuajo+Et/7JfuL1mQiy4ActFH6mtf//3XT8cXN8cX483oW7DyZDfHU745HaMepLbgvR1P3JdCNYpZkVIWLwXnNk/TbvAhkzvW0/EYWRDJDy3KKRHPbUaXvVr5Uc9ItLUA8l3VgoiE27UCM2PbctUApJ3nnG2aag2Fb9eZXjhcjDkXODDkyGrME8xzmVvpTt7Jahx/8zfHk4NHcejwLViR8YCYpeRg0a9WM3h47FQ1nU5Qr0dY4EP7GT60m2s85kyHrxd3eS48V3fLfiQhW+E/a8ajFZ0HGLlLZD9K+W2Hj89V5Idtw4oTkwiLlvWCAoLzVaz5IR8G5MO+l5lYrGWRKtryHD6Wcw3rWR3Iq/CxrBuAVOhgqwHJmebO08TiztGaOmfJ8zR0mdw5YkoyiegYEBJw/3t/799x+OVf/mMFvz266BsYfgo/dbvmejfl6arkcmXF9lOZKnwc8uG6bb+azB9n6YzWaj7gUZIkbNShQ7fiwCEBHlfdlTqEiAMEVmmFQQcJ98mj1LUmJHTSiUfpWbMbHY3iALLf6a7NsRh66ZO7G2Sp+dAunpvatiuBKAk1tExM2A/LyMuqDj3kqcFHOeI4fWAfHCZMDdd5Vu8RkiVyqeW2um7+AVdB4YBB17LqOulTG8I4R1FxYRHn/xkEpiq2NNg10YhyXoMRAmQ+WvczChFH6Bw+SLbhk2yteLG8HDLXkUyYmJC0lzooUZb6FHhsNSgQebiHEEEa28apOZs1lQljGS2OYz7as/x8fK+8e5w4ZTxUtjVIMuPyS7klczO7cLJsgaoBHxOnahMrBCcAGYIxIpWTieWXeGl/xf1fMf79f/Lvj8cvuugCIBe9Kspf9s/54PaDp8ebF0/Hq+zZj+LZjnHMt7UY/VQ8lttp4jYXwIpYmV3ahPNWeL5AR56HDoY1QKQNtwNpXIRmM1vOgbpAWxOxFterE7I/DYCoygIvELKQNLhZSmnw4a7nFg74GB05fEbE6FmE8elTnr71Lbt3uDj+mT+Tn/75Pz89+7Vfyy+8rmP0aw4l8GwGME0iZOpSSp3DxiqgIwYKrtdd5yDRk9CXL02fPZszH6ri8KFdQEqgSQCI2/y8uTiMlFjP4KFwL21nTeai67J03zLMbYCz+X3nqIP4PjSe+ezZj49/zjmQNvBoa2nPaDOHzwBEPkGTgtbGtywteGVmjAYbEta2bg4B8lGzP9BmfzTwcFvODUBm+FgAxGOFn1PAB8C8wMe09NqPTEgm+7HWgnzvdREhX3n6ld2Qhys13UmWKxiuSin7yRxAsteAlOpdQMjIcW00bduXaJReezp4YJd2Et53e1z317LrdhKZkHW3knXaYOUxzh1GAj7Qa1fxQ6GqVIUhIKR3hFknSV3bdtVL37sjapI6yXvJeIQlgaIglDQJ4AgXtmL4CiCR9Qj4aI7C9/GpPT3c834iyIYekCWGgXa1uEmcAcgPiSaMZSvbvkOflsouiSiI46wcAm0OhlAe4KMWB6qquCO2V8v5sEaCYZwXdrvQ2hwTrAAYINKSIC2TsrxeCwp76TWOJOlhar0qYu1CAyGCre6IbkxlMj84LpmP8KmcyrPydHrf3j8VZHOXbv66oBCtBqTArGVoitVc3sOQTAukmcaCMpHMAAqlxmxqE8HRaDPQpmP+R/7kP3LAJQty0QVALnpV3/iF37fJ98e7Z0+PV8fn0/XpMF2VyQHk5AByyHdRlH46RSE6ezMg4MNMOMNH63SleS40b1kPBIDEtWn58AXS3KBZmHAzfN4lhIScwUcENzErosgnzYYsHyTP6j1sgY/CnM1V6nnEOC8lMh+5OGw5fJTxeLR8vkVnmsDVSrqrK13v92m73WrtYOXQMESWY7vtVut1zXb0m00fENLFOrmmiQ4eRRxo1L9ul5LW8bsBIB6TRwyDFl+br4uv3d10nv0Ip6QgIWbGNu+izSIJR2bGnc1wrh/2rVfnGbC2Z1nb5eY5NEhpWYka+Qk6pJ1l42Aiol03A0dK5zAyX3MtoYFPBL6aAWnZj2X7VRglYs5W5snzLPNWReZSBCIwVZxEKnRk96g6F6MHkLjzP/qP/g33wH/K8L3VRf8WpDenN2/Wst5ath0m7BPTPjIfUYw+RrtyGyPzEfCxLyzaMgo0xnYr8ToN9YyHRMbDLQ4f6uXPUVys2xSl0BVEdJ1qe1WstAKIdNJLa5krFGndlTp0vUL7upY509GGCnYzeGiCJoEkVEMtgGPuryWZ8x1OfhQ/Aj7CJx7jw+J4wmn0FrDHmLhuMBMI3Q04Qm3VtlxZrNvz6McPi+hOSBJZkDlThKWIO1YtSwEYSBGwZT6SKlNaitC1RRVNCVWtwJ8U93n2Q+YzsnULW6JNmIqcdaFSUSUo5AwgBLn0vmq1JojY/nUkSaQwhDb5fCoVPDDmMdCywsd9vreTnXgoB4eQZ9NJjpkgCkpRCEQUdBkNARyv1KvU+8yWW0l7AMhoYpPBKnwsEDIVKZPD7ERl8SGa+e3D2+Ov/qlfzbjooguAXHSu3/3X/4Ht+++frg9PpyuvadgfXuSrPOVrd8DHo5NnP05Hu5kmJivKYsBScM5pCvhA/Q3uHGXytVvGOM+ZxQwshQ083AaAFKF0naVhYOp7du7U1TprLhPGKW627IkIzkHkYyCEEo81k68Wmz/UfvjabQzwyLluX5oCPsaRRQSy3aJ//Fh2r7+ert58s7t239zd9fubm7TZ77v1btcFhAR8BIT0vu4i4xFzPRxMehHV+/uSvAOTPn9u3enETnWGj64Ttya3OGjkrkvFY/FowxCxcyv7XsWj6DLzm6zw0Wo/ME87zzZ3vZri78E+j5a7JH6AJOcgIuSyFLTH5NV+LmSEsBKfXuw6Sa0GpMFHSqLLehEkdA7JofmcEc87X5Wcm2Ft+9U4ws2pFAFZv/7JHdBRRCLGFiyZgLCWL35xdfozf+aPnfA91UW/6z/yu7Za9Gpv+61NtiulVNctWHnaBYRMNtXOVx43WTKLFRLUKBy+STd63V3rVX+l18N19a7fxdarsIQdOsJwAInsB3rta9VHQpoLnwkRipJUgaQWCSahBHhUC6RaKQlhwCNSsSJTgEeZkDnfX+BHzXzYWCaOFvNGTjyNDiCT132cvO7jOGKcznIdaAPqlsNa5uPMoR8yACGiGL1npzHmT3Beu0GaO2QwLtPBTQM+wqmjrzGX+SePiUnT+UT5Bo0NPBqMVFk7YBYOCCxS2AYXekDr800/MrIBCAjpzoYWMtacYamtWUqhQwcO+VDxMtDS1xHNowWMBIA8LU/HAw5lKZAPL7fb8iiGwnrM3dg4WWaFkNZK2gx+CtQsCIXFXWGkXlcEiZeiXg+p7+Zv/qe+ecIvgrjooguAXDSL8pO/+/1rbx97c3g+XpVDvp6OZZ+9/mMaaxveRzERfTzZdcmSchGWDOb8UNS7wEdZhvS5kaeJLMWWQmkTs3oeXsADabViv15zWK/hltVqhX4YWHsiijAMMmCHLTvCszap8uEQQnGxPacVm4db1mMxSrG2tog5F5LG3Q7Dkye6+8IXutuAjidPuuu7u257c9PtZujQ9Xbb+z0ndxfu3TXjEevYbuUgkXKOrEfWBh/jiF5V+iXjkVIKsBBpWY++l4CPZZ3a1issmypcCa32Y85+FM4drwoDPpbC8ww08VNmK4hPru9nG19pmQYBROYIeaXap9FBrCMSn1KvAkes2+T8BQa1Qe6r4NHWM+PGHygzgKB6gY/JnSNbGBBCwtU6bsnJXZbsh7tuwRp97VG9Je/feLhkQb6H+tPQt9ZvXe1kt5csW2buWbgdbdxOZdpGFiTgYylEvy5SOoMfYoiC8LvuLt12t51DR7oZbjQyH/t+HwAiC3zopttE1iPc4ANJExQqCbrk7ircCgwVQowWMRWWZLAKGTrDRyeUtExaTUIkY9Fp3jAT6MGI0/zn4lynrp9wOgV83PP+9IIvji/l5enVnm1CiZAFYhAYUE2cyWDED5kEIhm59Ei1yW0jLoZa/QONFFC1wkGABpJG7Ji61LIgErHVcYBQzGqdx6ThR9t6VVisFXdn5Bw5Cy6NpxQ6h1liMDgkmkKRkHQBECygQqIe5ka2XKFjyXzglE9sgwwbgLzIL8rT/DS/8NVyv1gghHCVBY4qtKJEXDy5S2RRSgUQWllqP3IrRq/gIVazIKY2ndIpJ0vlqy+/evrV//QlC3LRpQ3vRYt+4Re+3f2/v23rVbFhu+I6KTb3kM1pxOp44spyGaaprKxAVIVdKui61kkKmH+zq3Bbzskt5lJSlhFGIqXQ5jVMRND36Nyp76UbBkQmQB++nljXGZbX00wgMrf1TUmUrpSUqqCIzS8UhM6Gx1Fjfb7lKgQUiBSdv76h7y0BhAiX16rOcCB+f7GWFOcRU6pR4x7meoz6mJ+rzrE+RzwqIOLQBi9QF58/Ues+SsGypUfgdsFjNd0WFpEaU4qobmFYXBEBiFnh3PK3AhXdASF2OtVhe5n87PDxfd969QnuTwQkxQBLgLb7kDmz1orUKWZWQYIuEbFPen/LYMNSipxtnarWUqTMNaf1+lKnBH0VQuL17bU5mzvWzShLF7m6PnsfUym2VZW1GQ6lFI+xtrVf36Sk65Ty9mtfu1n9/X8/Mr4nuuhrj7+2ysgrKdLTOLCwz8yDFeuP5ahSRJMlYWEyM1ZQnCd7pMfpce+ZD3HggEd4BgRR+7HRDaLGI7ZZ9VJb8YZFIGi/C88lIx6bp5crWSilFPXDJpl0xGiZGSuuAiGQkcWVIK1wGpWXJ1DMylJdUGyZjG3zxPWpZOYycpoi83HgweHj5fgcz4/3uK/5U4FI3Z4EhyOs1A8mpm7ClDOzqSjqFi6MJZyR6bYfRgg54ljetffvIYKd7NcGYwBlQbHECibF4AtRTVHib50M7FuRuYmILmBiLTeBBFuAQ4oVKSw0MxQtGl9TTWeMwRw7dB2IycyYNVMglvwQXf55gPF3z2/nbx/mXLi02pSIWlgkM0tkPDrtZClCrxUbDs2c8jyDJp43cYK4EpL4geyHuOrzWaFiWu5NSEIoWh9DLm6W+lXqe4M+9QMEAwoi9qKykiwDwbXB1iZ2gGI9DMP6Pby3rUknAXHRRRcAuejv/Sb7txXD9RPZHQ66zae0U+atwM8nrsYRw+nEvkyigDElVIuQQM2vulOZIcMAqAL1UTEDIi4mYDoMkkSkE0GnKt3yPGWrfqPEuTSgmLfaCkvBSMaJCEAAKovgiiBoWj54AiYi1VA1Xa3okfVrAhDVli9XzONvG2C0tYjbo3r0kCABJKoasc2hEj+VNo/KDPBOWfLuuzN8+HauuBbPxwISHuFuEWigMYOVmkg9b5YFzubiwgJ3aXNHovicrf5jHEn8cOtTgUqr9QDobgDS6j9MPFIEMLMGmAIIPwSeBB+iub6JJcBxyfhV8EgJKkITQWn3rMqwkK3wPNwyHqxu0LE41q1tdSGJJjOszGxDyj2ZNqVwkzPXKdl6nkGRVo8ejTuA94AQF33ueqd7p3udr/di0lu2ISAEht5oXZ3VYrlHQVesqFCKUpmQdI119szGyoEjMh6yH9zdPorO6zarBULQSz2QJEEoIIm6XSpP0klH8QMG5pQ56QS3nPTEwJcRIx0cRKl2spNIq58GlEIl0Cawm4t109UMH7HOkfmYME0jT9PRAaRmPvDyEJGgJSTZYpseyaPhLt3FhjFZy1r9EFebna2xhetkp/LSXmavGxnfKe8c/UPm/YTJfvgg5D5/YOmQpdiGm2Gj677nPFG+06QBI51qGkqfig1SaEpaBb5laxbcSUXhanuZhErrUlchJGuGWsVUJKlHg5AKJACkoBQxgYkBClPOBCJLtccJJ3wrf+seaOWU1hWWlJm1WIlshzgUqEJn6GGFWhltxNIJC0sFhxgsYCgRLCZGocxF8TKDKmdVMIErsmYEEa/2gMT6vqQBQwBHAEjnXhFcUbgKGOlzv0LCoKbr/bTffv2Dr9//En7piIsuugDIRX/ZWw4fnWzLKOtVn3bHF7qx7CAyyXZU2dKwHk9YnY6UcWQ2w9R1KCnBVJFJFBFSZ0HExEW3pYRktlTQkXHuEFCzHqnrkFTRuRV4KC5egMI8FLcByIDATLj8NhukKilSyYQGEdTl/LWI5pSobknJpOugXRfnM3ik1IqJLfBB49pScKwzVEDnczmDjPqU88dbUTJUoeNILzKf4cO3XcnTp1kAWXbtAk0i5xZb7t1EyHmtRRVskBLRRTOiFZ+XYmjZj2mqEFLaLIvQD2P246Ofx1frPyhnA389pLMnSoT5OSakYo6AeRBprz1Te90rWqAjd12AZstkQFVRHmAHXLaFcwYiCtBmfoDuBh8Rz7ZgzY51PA9oalkQbFXtPiU5mEnNfrg9pnUMJtztpq0PJlx9DwYTXvSPQXe2W6lpz8I+MdXBa9lynK/cASSrzBxA0hMMALGEpG91b+0e9Y9Wu36HfT9DSKy3qdZ9BITUIvPIKPTat/9kgUbJOTNhAZJEsWQVPk7pZDUHIf4a9EisB8REzEwiMwJCDKYmJkvrXBoX/LBiBW7mkpnzyNE95RMqfETW4+TxtNQY4G15e/Na99pwm267XdolhyZdd+uKTOpH61yYLTMg5FAOUdw8eeZn8538ndWv2q8+9a+Z8UOkAtJrX8aoxdjJLh+57tey6geJkX9DmtJUy/YGW9tgOS1zwVsxeIge2aXOxAVCmGgu6bQLgGTS1DqrRISIVIcUqsI5E1YzIH507AyEqCZZ2gArCEQvq8iEZOZSWAaP/WRTQIZuy1ZiWGHADcmAkDkTYrluwXJAQTzXrQKJfFy/bEPLFV0NoGv+6Sxc6tqMBMMSEa7MTBYKgIHCvsKH8ETlGhnrlNIaBZshD0dVXcXU/u88/84lC3LRBUAumvXTbw/r4/PjalTdiunGJl31R9n0yd3pukuyTkkGM1MzwTSxFqCvVrS+h6VEzluVIMvk6LSAQ2sr2JnRVIEAD39d1/fStmDV2j24zEgRAUkse+UNwOTrygkkbN6GpWJW1CzIwFq7VJkzJyKAIbQ8pl2H5Ja+Z6w1JWJpYCJ+XumiwYW7AoWILpmXBhoSWiAkTrBAh6gbpERnKweO4lmPGT4++CCDBLruQ8GjiSINtsRmV7DjsoaIwtUK8tssCU6TLS4BHzFpvXz/t0p9Pzr7iolQyVaHEdHAZe+8KkAqRUxJtPI1A4SfBEJOJ059HwDS5oIw/MAfrHDCZbhluF5cAMQdUco00XKGm75GXkAkR8OGOWNTYZpYRNraLLmxKgUOHQEgs1PSl32P7be/LRvgAiCfuzLSZth0YtJLmZ2ZEwx9hQ9ybWYDDCuSHQQwGNdYy5P+ydqhI8X06W2/lXCsPSsSECKr2nZ3XQcNJk1U6pLZLAAhDBVK1oxe+4AVxhaooxwDPqRjZ4kJagrYkg2VIgTRSWKRXIB6akY/UGjLjr+JUxltnCZx+OAYW6/GgI9ouwugDDLgJ9JP7N4a3tpE/UpMzvbsTfJ7lzNYEqM1ALGxjN2m+KGbtC7rWt1yXa5Xfzb/2ffewTtH/BCJYN2ONXE6duzGtazrZPlBhm6wPgHYrPr1alVWCAAhWcHPxWULVhhLFoRVHYvRtCsVQiyeVx8Da4yjlZAZLUDAOtaMSatwFGFEURAm9QsQ9458AUsGawXiXWTF9mUfHdVSQqKrDVMM4IiidJysNltGYYmfa9jpLkBHHUYFxJQlc/5mSpeoCwZrcOKiQmWBEYSKlUGKrFX0BMUgWQYRWaWS1hVKjGsYThEfT493lywIcNGlCP0iUv7Nv3L/WhSbM+dbs3I7jnZ1GvPN6VRuci53pdhjUjZdp3CbquT1WrHZKCOuVirrtcgwKIZBpOsEfS8yG+oWv67brfRhf+6w2Ujvr+9Xq3rezVkRSfNMjAozbqnZERFptSYRlo6HTLEmLZFMEc3ojlhUxJKq9arsuo59c0oW4NP3PeP7udXPtXasig5WyzDANpujC7Dy6Avt3Oprl8a5X0hJRLQUpGit69utxOeCePYj44MPJimFUBU0pzS7rZu7Tos7u212amumlGTJvmCZJYGcDdNU6tareeq51bkf00QDKPgY/fAVnhMfIzmbC0KXALJcgbRIop2z/cJxXrNlS15lD3n1vkTQwBpSRVngg+0PswYd1WWp7ag+y3q4ZekWh1p8Ho8/NFSQBlGx1qUIfUxJs8ecEkaP7jT2Pfxc8j/5T/6xl8AvEhd9bvpdf+B3bVZ5dZVy2jJzJ0V2ZrZl4T5mgFixPY17M7shuIIACpW3u7d3X1p9aXc71OLzcNoO2yg8r/Z1wEh0vdJVNxediwtnIinLh3wpFthQJFuuW7PGMsqpnKqPxZHEjjjYAZkZBrNqssyZjsmyx4k5T3DgsFOt94isx4HH0wt4sTleOnmMIwRlJzv9mf5nrr6y+sr2tdVrnsN51D1aP+ru1nedbyPrHKQCopLfe4q4SjUnkxyQUh2EqL126FRFJTFJjz7FHJH4QP+DXoT+YSBSUHjCqTicZS/MH1/y5ZjQyU13MwREunXoh4gS0a196qUWNIpC/AgZ7RzYONlylKlkqxkpixhXAggDEg0GCUEiKtpsQhfBiIhYpJgXkU9L3Qbb0MGIo81brTzGv5faDWtpvwuPkUUBQaqoJJnrPeBqYNHWywKQ6oc2wSHRdpexTr6ePOblv1vm68lj0aQ5acoppfrYUIb8K//pXzngx1cXXQDkov/q239wu13nxy9eTNclmwOHXR8OZX885OvTKV/7+S2JGw2+GOqH4rHvtazXqcGHW+CPVfd9rEXCXQdZztWfkzablNbrAA7t3Gm1CvCosY84DGEJB4ScdR+CitQYQFNf1yCi69CpcgER81i6UqyLc1XrUrI+pQYg9fnhlFJEdUubwVHXC2ycOekcG3yIW5MqUoDH4WD6wQelgUdkPTwL0uDjHDg+EkK4wEdJaQaR1gHL10hpTr8AqPBRSuE0hdmmnkf3q+I1J9nst2/rVej7lE15pW5DlmuMIOFljSWc1wbJw3V6lIU8mtjopEnawgy21O7o+c/V5md6tHnSOfkw5wPV08Ts8Qw+WE4nepTW+YrtPhuEnOfLZuDQSQRTSuqWqetk6vu4jmm1ksM3v/mHJ1z0+XW/2r+1X9t6K5PsutztrNiOxo1lu2rw4fHGaFcQJHdkNNJXhq/s/cN7oEe6Wd0k/+CeHDwiCxIZkRTdr1b9at7OlD4UPh5sc01ILhlTmcI65hGncsIxHwNAcCgH3vPe/NHKvtWwWmCeLed45UgHD3PowDEyHaeXuHe/PAaImFhWUW5li58dfnb/lfVXdq+tX+sDOh6vH/c365s+fga/73b/KX6W9XzokIYZPNqEblFpH2Q7dEoQ7/CdQ8QfRLV7/SQyGB3SOs8MDcv7sYyCdA811nGQXeqQNGmDhBBdxrOWtlYqEExszQDG7OuopYm/o8lgTJIAQZv5UR1Ck9QDhcWit1XkNXwtZlbBY7KpgkasT+UUDlhlXBs5wmByPv29HcvPaiSX5Avb4hVqkxoWgIlrbRvapEmLR+si75O67OscIOLnuQHJm3/gzenHuCPWRZctWBfd3am+OBQt05xByBmaM9UMCkqXVLuh7zQpi4haDObre5blQ7TN83Zl+XAmVNWI8BBRgLqWlNSNCiaREZk/7FMjugMIEgChqxQw51pvUuatLTR3gAMPB+Z4/LzAnaSUAuRMmJlMkwkZa3QeOrM5S1GKSEoCj0iBEGC7S4ErYiil8Ly9SqrOp6hDAgAcPOT+vsAnmld7BsQLz3O12VyG3yTycakHsYhhkbBYxFe2B9GMKKXN/giXpQWvxd9JqyH4bWm5277m9x5U+Ft937bGMobDAOqrD5NsayEbRChFCsm54B+Llnoil+JcZkBAg7hYBbgZMJszmRJFlfqQgaKrvo6t8HwGELpR4cPXmWztoukSV6yAZQVSepIr9wDI2oxrElEP4pErVay/8IXx6u//+3kEpOCiz647pNN06lZYpR59B6ATSAdiCJNz/QeIsCoUoRu58XzHdb/WdWQKdJWW35KnISLCQ1fX7LUXgUgpBaraoCPWH2bxg80KhUAIoHi0yaZ84MEUaipqBMtss7rTj27JU66D9sdg4GywAqA+v2NnP93/9PWXN1/eBnTcre5SZG8CPFbzUfMbbS5J69gV9x5w5FBkq2mlvfZF8QAgRsMX8IX9M3t2+jX+2nP8COjEU4CdtSyBQEIIz/NBEgIsIaCYCBfyKF2RrnTstNqSpuI2ZqJByWIeeczqEhP4IYGevfRxAhigLsxsU6OIoKCYv8+1m5lnRFa35XazkU18L/hruQy01Ix5Cj6FGl9zKYAvFTy4lG/qsoFaMUZ9j1IFApqaqCmNJnEhNKeCRRYQiQe3SDiwcIzXFyubXPIxpbRh4cmyrSXJCcTmxNNl++iPsy4ActE3v3nSaQLGUSLKOHEZ3lazARVEREgzFkCKiJVhQAWQlNTcWNrHcjbgEaoCQJY13DUjonNmpGVH0NaSUrUurU8t53iM1SmZ9j00akcCSJZ99Q0IJNZm5o41EKAxjoblw2g4kQEhojmLuqQU8/NUvy9JJdHa/sJMAFDa1ptYzwBAjGMFDfGJ5nj61HB/D3eBAwlOp1Z7ApecT9b+SImQDTwajJANQiBk2JYPsobZM4SMI22aio2jFfK7Hzb4g1l4zk/RBQttbR6MZHrYM0AuCKikUVzLFSVleb2WhzkhlLgOGJbhhXJekH48cjKTZYK/sBTaPDQz3ECWYsYFHMG2BasUsch4zACCyc/bnUNE55uliQvzOq4zkdia4WWrBZm7YVUIWa1WXO122YvRP+i8GL3gos+sr+nXuozc1doPSEdjD0NXTSSPfYMRgaRWQHyjNxU+hjjSEACivfaID+/uqCJAOB5LmoRGNPgQkQc3zzMnmuMal7UJxIRSMx6eCTk95dOpXa9wISgep2DfAI8ipUIHhQEJSJJMKKZU86L59Vc2X9k/2Typ266uV9fJMx+dQ1TNcsT9+yGddhWBUMHapFhhUPRJT9L50YYmwlVY5u1GnMqb6c39r+UfDQAJODBaq9WBi25oHOLWedtsRC0KEK27GXOX0Zeefe4tIKRLXVFRZpszIA4Ox9jm5du9psGGlAIPmAQGRNrdoyD+JKCm2tZL3hQG4+SHf52RpJzkFP950B49lunpXLZKScCkK1FoSm1gCVEBDLJEFC0njwaepYxMWv1KfUWNKq0Yv68QojiRPFVQN1QIEZWVx1U/9WtVPTns7r7+a18//NKXfyxrQS66AMhF/8A/oPr668X6tWEazcYTjZyLsFVT3UIlYrkUYmk1WEgJAKGvzSM8ckl8NAA5+/AWazBAIyVY34t2XZzHutZ5MCVgNuHXlwwFxa3Vrr4n3XHdxpGYsx+WIppxgQ+L12qcr1aCnCkPBd90Q0lJZgwYcUe2BO2/tm7STEWVlCosQ/9YC+9PpwJvqYt33pnchnGEX2/3QqjKK/DBj5jkzVi3yOVDswE0Ebjpai8nHsDK6Eab/xHxdAoI4aeEBf6AF57z04CPAMKzmozWnSoBBlK5JJgo0soq4jpEta45f12NhTQIAaR9MOSrEAJwIisEs+vmxgaq0Mbg7f7NwMWtBqQCiMdsJmxZt/azza9VAk0mgIiZrEisIwIRuRSms8JI32P9G78hWwAnXPSZ9VSfpjvedYkpSZGuoHQEU4BIsTI0+DBa36qJVrKKTlF9L/OxFJgjSQoACUvELnXihvhhYngVOloGuRpzdBEKLpBsgupCshSrsyxjeOAhMh1xHYICIqJRWKOiwgk7dFzghSpqV3rV/fTmp6/9w2Ct97hd36br1Zz9WPeBH+sAJ+2kexVA5q1hOqHLnXXoRNDImaxwUmesj8OT9GTzE+Unbv48//zTHwEAKdkeZp0sxdqyAOOcyteELnVQ0fPtV9J6kJ26kwWIdLljn3qL50X9h0PkwVsYH+DKyHXQX/tPlpqWTjpZumAZQg0UQnMg64PGgsKMXMRkgiJeKOHUJn9griykUH2tguUQmb+WLV/LjC/l5UjQFOoBYmr1mR9ZT0NsYTjSeKJwMrN1srSmcWPFTpLkaGYrLbo+pR/bLMhFFwC56FvfEh+WR/vqV1nMGGDRSm6R/MQokjgPXQPm1ruAWNclWz5wU0SXKGG4WoS4Whak6+rzy5L9MD/Pc2E4be5OJVwyEDXzkTPPsiOsVq2xQgepNDOPoAeZDZRSrdM0Zw3Iel/mLoDArMJJG/iGuV7DOA8XNDRkIVEfm6bIehS8/37ARwwXtAod7edq4EGe++Fz6yt1B260a20LVphn1+g6vweYtcwH2z1xmgLGzD7P7VDf/+wH8SnF8wLyBYJtef8UoDuuyQKZkPnfK1Ocz6BNKYUBBfYAHTybJwK+CiFmsJRovk4zJCMtNSKyQCPJ8wxIa8P7yva6ReIiG0iFiDMY6UmsAA5mHIB5Rkgpsibh12z1+uvTFuBTQAwXfSYd5dituEoGqzNAhJJAhHsAFUaM1i3ZD3FD/Rhk0CSpZgxcotD6ob0eWusCWmxw+7Fe2pS2yCXaMpQuXNzBs+ORx5dFSgGQlUoRYYOOJAmxXrZv0aO1bMrr3evrx6vHw+3qtrtaXaXr9XW6Gq6icL7WqbjnLVh+xP0LRRcACZKWSSd20qFNazcaKnzYRM/M2NrWaZd2/dvp7b235733wvcJ30Ptse832HS3eruKu0+SJPqQZczT31VUDnbIURz/rr0bRfgTPoUSkowcS6ylHWeZqjbZo+s6qCkBCEEuUIYAkFW/QtTyLJPvOeggApHIFoGoMhqjeL9jlyabrBV604hOuvbftLYNi/UcceFsyjoKe/QNDFDRSJIGAi8b++prDZbajBFweboCDJKQrRUUO1itS4FC2dKzEXAmEZkjZCC4IXlwjwEgxcpaiqyTpvVYxvVQhpOYrN5Ib2y/8a1vvPwfvPE/GPHjpIsuAHIR9Z/4J97RuzvY1RXL9TW5tKGVvvMVmM6yqxU8yICQgI8KHWjTupc6ifMoAHgGIQEv7HtgARBZoqVU12UZX6gLRDBncJqAlEh3jSKzzUDAhKSYsV5xw0zFzKQUM7fkbJYztBS0/2gbyUJKmiaYP66nk6gI688NSNv6tGQ9ao2HQ0dsuSJybuAREa8ChlteiQ8ipUFIAxTO5/BYXTxULVFs2cszz/1odSCzAz4CQkh+xuzH9wE+Plfw4SuPswGIm63AOwJaliKliKIioGrAbwArJ1LK/JYL59e0OSLA+X2YVZelgxVaBgTzKZYaJJsBUkp77RkoCZrqkvXaUhj/6nPEDJuAEI81G7LYz8tqs9EBwObrX3+x/qVfwj2+e130a+gePX+UJkypL33KkjUhpZFjZ7BWB9JHJJjaX1FsrOoW3GjbWZKkiOIRrcw3aWr/GGt81e06lmWrNWh/Gg3uGUDIYsHAzMeMfCRpArGzbAkTEuPwtfm6beGiuKJd7turt3ee+egdPrrwbth129VWa8erfhPdrmoNS6ddqwERGuf6D8lY2vImGouZaS2uTmNtA+uvLkc9RqwQ8rg83rzg9wZAHDrSl/XL1w5U2+v+etjoJkrDtZdeW01DYamZhpihcV986GD54PR+ef/4a/Zrz0aMhk+geF7LDEREy/i7k6T2d9xMCEjMuJgtcxgGrsoKYz/GwMC5g1YauNZ1h1dkNMbWrGUrFgpKAVEzKVDYsg2rtfGVBqyFpRQpRtAoJJqkbYqWenceQ+qmsD7YtMxvZ0QrOtenjBhLhRBqe24rWOerBf0ktyCORhtpPFmxjamdipVDZD6QcZRRVqKy/rZ9ewvgAiA/XroAyEViwDvy7W+DP/ET4H6vUC3a99qR7FRTB0DNIPNeZSxbq5SqYqppyXqwzbMQj22Nprpeiibd6WzWRbjMGQ5xs0YSLAWcwUM4TeSyNWkZeEgrpWUZrAGIzOvZZIWQpTCd5jEgRCKahVHIGpPHZGaaM1IAyTTVYndxO3wQEVu9QDMZpvscONq1FmVZN7drLYLNs0AAtlxr278icpl6vkSaOwDExR/arVfkZ9p61fRhv4kzEQo58/DylJatarM8NCU2kNRwQEjOMrUWuly+wMNWrlfvXRhA6MICj0KCLQMS54DwgcNbhkMw6zw2CGHLvLz6/QYzWaUkQynwOEOIGVdhkp4FsTVwAZDPoq+Vr3VJUi+UvrCkxJQiCqUjmcIG6wn2ggesbVtx6ul5BjgOFalRmucHl4DzdYvLEEFUzytbzkphMVtmYk6corXuieS0ZDUMRES0TIhAapYiSUL7/r6WLw9fvnpr+9Y6WuzuV/sUrm2Ch4221sGx/cqPeQYIdQFra21m41yWImsdbChTmQJYIgvEGuOQXjey6a70akglSUEhPkd9Vb96/aX+S1dPhidr/0n6XbfrAoDi+7oAQuZxjDUzY2MZoxVtvspX/U2+GWJmyT+Q/4Fv4RPKaDwHyHrMgqa5BiQyIGjiWRcsK+LwwSHXeiCJLEi0ZHZIk7WsexAnnClgKcA2WVKX0VhajsJtSlUQ57sOQCwT8FsDYM4x1IDJI8WlUImjSEEVq9u/OXroTet7Z9nyES4uR0jmQ5bTc4gZipVd0nQoLIOYrM1sVUrZdF13zJZXnXVrMTndnm53ngW5/zRZkIsuUvyQ6yIqXF/6knU3N9rt97U9brdaVfcxB2MYurRadVitErbbXjebPrml7zuqqi2lZw0+PkZse+KL21rb0jAZDokbFEHrnIWl2B1dp+z7BL8fDkNvq1Vf3Da7s/W6riOGizv7/Zbdrrfttiv7/ZB3u4h93my63HU6qepkJqdx5On+HscPPrDDb/5mOfzar032q7+a+c1vRncrwuzjtwY1uAg/qJGFLfHciNj+tCWyFS2HzJqJUshW/xHO2dCmn5cCfh6zPr7/2Q/is4mL0WJx23xSARYP/66Q3JqW5vd9j9qCeRhiLg2GIVr690xtO9UnEVndtl21a/yts1PyCktptSw6e05nxk2DDY/DvMZqmtgPA1fAuAGY8N3rogOkdEXNTJIkDfgwmhosgegI1uhOS5LqfHYC5yUQrgtBqxWo1z4MPMKvXjcsM0BYrBV0+8o8xnmpxeXMJeZ6HHE8QjABmASSFZoTUlbRkiRZpx09sv12Po5rvR7eXL+59u1WncNG8syHrof4CLzWZYBiWs7DtYvX0q5QVBXNSROX+hZpheoOHg1a6qrzw2PaYNNXSPuclJDk93a/98nv2fyex1/dfvXq7Y0f27c3b27fXL+2eW31aPsoiuoHbynch32bWX833A23g8f+bhV2aNm81b+1+2u7v/atJ3iy+aTteJclW6PEiG0Llqq2OhDp+x591wdswNcRuXRHEwcPeKytjff9vvti/8WbK7la4RVFLUhmtsmPBT6rip/FmiGQCxiFMcpYMnJ9bkEpbgsblqcDEmoA0XI2bYvWIPNsl067iN1a14NDZN8AVkVjhVCs2/W41kRwGxBCck3jYGYR17nkde2OZXmILIiatizIj5EuugDIRVKK6ttvS/fmm9Lf3qb1bue8sdKVg8gyIFD9QpL1ulN3jcOQ6twMVSggfOWfwzmMYFkTYA2l0NqE6LaFxV2jGas5C4AhJNIsdENV6A4wYdclcxgKFwcTd1cCSBqcBIxsNoM5dJTtdigLlEwBIg4mYX88Teu1OqCkfH3dTe57h7FxvaalBLwqkktsfhVEPokR5iyErUFJe/wMPiKibb2aprr1yteg67ejToP47Pq8v7eESfCjv6Y0COEyoV+WLAPmjNs8JV9Vksc+PAxtOKauhkH6Bwixj7uN8/PPCcqkWkRllqoZlpqPsK1yZm3Ha1bWIhwArH0b1grftS466EHGMmrvR0FJAkkK1QYhrQaE0kAPDUAkM9OFEgcLlryFuOu6uQ2S+ygZDblU4EC2LG5kLuPqGJ4LlN3Tvd2PBxyOILJ7clfwEJWSkCxJanUf6oZbOj9ixKC32u0DPiLjEeARDujwc4m46lcNQCTg40NbBCeVcNJK9dpqXdzwdVj8iCu1UD9qND4v+Pg93e958rPbn7116Ng6dKze2L2xfm332vBo48MTN3edw0fvsffz/vHm8eCF9ivfbja4K5D4444kt4Pbxy6+tvmp7qfuPsHQQkyc7GzLETVWqtRUY9uK1d6DBiEBZrWgv76vw1rdqb7//aZzABkCiL7cffkmSVKcKb5fbf+LXEHEzQVEInJRA1xp27AmTCVLLiXOGoDQSgMRYsmIQLh0RotD46jgoX294wCQiBvdDAlJIKiSRXEuOi9xLiKZWQDIymirAJBwyWVdSlkho56jYLU5bjbf+OY3evz46KILgFz06NGkP/uz3fDkSbe+vtb1dptWm01yAOm6mAy+Xqfk5x47jfU8OVx6t8c2qRzyyf5JEGTbQ1ALc+va3SAkrjcICTdwEZxlmUWoAM5amIbbUL+OASQOIucZkboOCPHsTUCI7XYBIkN2EJmurnqvfwl35e6us8ePu/LkSTr52kFExmEARRpcvPqhktXkue1DYASv+LxQeYaPiIs50xjZaj4WCKnwsdSD1Mc//darz6rvf+H5R7+Ii5toAIoIbIERpiRsxeIedR4sWf/ZLFkQGRy63alO7A+npIrvmYhPob6UectVg5AZQFotCFdAcX9Xuugfg76Ul91Od5qZk5qmJS2rgmULFmYDSFC0IW11VoO75iwaPHhsH/2aJa591L5JkjCb4cONyaa5k1Rt0jrGeQAJHT3ier36jM/uJ04jgGnJeBSFWkKirxFWUV3WGn9GvUF82I3fuq+61TyzpJ/nlQSEnE/4DqeUXu3Q1c7Pi68bhEicB3a0a3Huh7S6A3wOCvj4uf3P3b2xeSOyHcOT3ZPIeNTBibeb2656exsAUie5367rtYiR+xhu/fBBkb0fASC9P7J60j1Z/670ux4nJMFHiH706FUgVRGX90UaeKjMmaEKZilJZELi/QwIibgML6xdxsIBIJ5x6h0Ih9eH13c/mX7yEV7RyLGCR81oxMFS1+FYV4EthjFijLK2UqTEa0t4gp+zlPPMCQSh1jRBO6lO4XZeIUSHaEswtFYb52rXZNEZTO/MbBsQwsIhMh8wrK3Yxh2ZkJ6F641ttj9eWZCLLgBykfxT/ilD+sIXZOXwsQn4WK/jw5f2bo91C1bvMfl5AIefS+p7aGTj3fWaCJoooh+S/XgQCbTsh3sBELhZPU/NQp5hRNwsJOzDP7AJl3ju9n+O7pYdiS1aASQ1skHJbte5Iw7ZHSDiQNLlm5uuPHrUl8ePU370KB39vTms16hF9OcF5xHP/WoNCPCwbjZrEVxkc4DNS2vwgeZWfO6RD5mQCm38DC1tf7C3Xn3E9xaBzDNhYiI+037P3iHRDQcGdHNxOeR8KxY5Q4jIDLRtK9acFWGbuJ9SQu9etmIFfGjvHjYbWcd0/niuyEfOI5EWv0dwR1KU5No9kLZ0xcKKLG7xNVc3N+MaoOLT66KjW4DJJqVRKX6AYmLqsVlBJI/S9thTyBNPNvoR0OAHAhp8HeDAui4zPOSSxddiZggRfIAPGqZSXytunHKdeM5wfG2/VjtLnUr8eczPyrPDB/bBSwBZRCysomyw4ZZlS40uEBJXNQq0vVC7rx+Cu3XAhwR8tDj07ojd/KFZVaXBR8S2Pj+vFpXWXQsKqREQgSAebcbnoJ/Z/syNT2xfPd4+joxHOAAjudU7eXXhm81NauurtRfZD7XQPqbTe/R1P1+LuhF/Vh/RZ6LsrnA14GMUoNm2zKnoHDFHUV8nre6ka9vUKoj0XT+7ryBSQW8BkNiG1e263RD34IX0uzf1zT3OVFhsmZpeUTZiHC42CKERcSxiPCcg1WNuCFw4x4xc3GYwI9hqhaDQNpywbcdqW7G0Q9dt0mYYMKQFwB4a7bvOrjVJuJSyN9qyddQCQgJAVrEVi5lrZKxgWG3GzfbHJgty0QVALnpff+Zncvfoka43G3H4kD62nfS9hlPYzyO6xdcPmY+2bz6c0gwhH50JOX+MLjDnlvWQEtHPI4bzMjOhZUba1iyeZT2W+GqxruD8+7fBcCkJU6owEnUjOWAkMiG+Lh5tu20wEgAy++qqi6yIPXrU2WuvddmzIYfdTj0bQp4Pv/voLEgYH2qziAy3mg+Y0Vrx/QN4GJtz5rJmdQOZj//A3k5/EAvPP7lE5iGVDhnD66/r+ktf0v1Xv5r2P/Mz6eqnfzpd/47fka5+8ie7qy9/Oe2+8AXdPX4sa4eRedY9aQDMjMuwTLhJIOLD1186YSV3F+577YehQvgQELLd6jpi3MdHQ4Z8yLn8Fn9H8rHQ0TyfU8lWA4IKH4D5Ofx8brCjivU3vvG0x6fXRdeQJ/YkFSuqpkqjLO95qlGWtVQDgmrzo0ix5/Z8PJVTQIc5PPA0nWaImI41Luf0SI8BJC3jEW6PR2S85jAdKoC0TEgUJB/isGN+Xp6P79l7h+fy/ADAFMrAjq5WHlSLupYtNa02QSLGx+4Aj4CMOptEu4jnv/dG3/X12jlsfMT63DyrBwAEqOcQafUx1Z9Bd7hb/yv3/8qffGP7xjq2VtX6ju1dhYylmD5gI6wBG36edqud+mPVS71L1FyEu3Nfpav+Ol2vvpq+eoOPEXlWgC3h0Hx2lhVq8IHzmpBWL+NwF04OIeHOQaSLIyAkunh9ofvC7bVcr/BqFgS1BqiBR82vMWSkoS5bT0AhiBNONVPWsh8ZOYcLS2n1RQY7b9BHVZWk9UhJloiUIgOykc3wKD3aRg3RGusuIUl0IHtNX1s/0kerVhcVxiKSGzPbeFzRuIosiMdwzYRMNg1SZHVlV5vn0/M1fvR10QVALvqFXwB+9meHIX6DvFoFTGhaACN1XYWNvp1HnLMeiFi9DBKsYBIQgjPNmRAhPkJm0gDDpqmCSJ4mlgU+8gIi2ZZt1GedoQi8KqGIvAInCjOgrUUg7mUeSbJhmLMhS1ZkgZDwYA4gJbIhDiDVNzcpsiHh09WVHlarmg1xvQoaROhV0DA781kGZDYjWsRSaHQ9wAfDmKPRrK0D4PBqZok/SjM/SLDBwXaL7q23dBOA8aUvBWR0my9+MW3feqvbvPlm8u5Paf3GG906rrfH4rmvvZa2q5UkEtlszrKRYgAYEglDgKW0SBuA1CY2dTvWMKDWhLiHgPTtVjarVdSLNBCRDwMmRvi4TMknhY4mkgpYMkNPYgDmNrykrGINzBmR3Q7r589j/al1UQ+ZdNIVVrp0bJ6HtZFCMGKK64TH1lBbpNpgiLauDgaT5ycQIHLIhwoSx+wej7Hm/XiPw3hAXD93vT4dItKN++k+Xl9fG9Di2BHnEe1leVkCdr5j33lJsiyzPrRBhh9wt+GBEo+5pGVAhrlMPPlj2qa0tw/IXddhARGklMSFT2II6A7R3WJr58rWmamgxBKf2K/odw6/8y6KzGMrVWy38ixHwMYMGet9tZ+LA8l8bbWXBUK63drBY6idvlqhfXT6qkXgm84P/zOw5M3+zf3b8vYeH6FBBhVtIBZLnWErKVtG5Kw4HUsb5rDUOpk0v+9DP7SakOSuELLt6xGbwtZeD3IbrZLPu2+1gvS2FcsFN5c/SeN5JoRLo4J5KxZLiThyrDHzAURaJgSuiAtCtX9HGkegkwPa8KR/svpq/9Wrn1n9zM1P9j95/TvXv/PmJ9c/uf/K8JXdzw0/d+OT77c4E8FkZtvCUgHEigWErEqZDcMKBYN7NWD48ciCXHQBkIvueH0dhbfo3GkBDzcWCxb4aOCRUkJ7LFwzIecQ8up8g/BZXpatqJckSkFpzrlBSIBHWLKft4q5h1pO1uh6dZ6CLA41FlC60dSesBSyo4FIQEjzZhMwEh7Kft9ZZEIajEQ25MmTPnuxvm/JklEV/Oji8wYfH5oBCbdMB2eDbR1QtkBIg4/Wfvc8A8If9a1XqpDraxnefjttHTQ2b7yR1uHXX+8Gz0pV+9+Hu+ub/bHV7LR56620ee013Ww26ACWUsJWzGhLx7EIPG9E5FZVdO5WExKZkOrWHW6z0ZUDyeoBQkLykf9pnMFX0Oqlqpet46oUAPLR73nLfFgiRUWknzMf0qvWjMcqJa5F6DUgWO/39Pvi6rIN67tQAnLJamZSrCiFrcBcSIpCI2r7z1rLflQJ6uC496f3T/f53l5OLytEeOT96SVeji/Fz+Hmi/EFXpyq4/qDTy/p9ue4833Ah53yMdbul6xfN7+wF+V5fqe8c3zhX0kgbbMVWrF30npIWONQrSjSciEBGDNp14Lx9o9RlkGJERFWUX5SAGnifIRqDIeKHxMmy8iGJp7HjxAf/La+vfuJ3U9cedZjcMAI+IgMh8bckgVAkmc9IrZr4RSg4RZHDHHwiKge01LvkgI94ohY55do/Y3+Fh8hEWkfzgWLkqbzfEiDEJ6t5Ww7lrplAZHUMiHrrh5xH5GTGbxRwO4L+oVWlI62/attxTIYWxbDzFoWBJwPYtEpcFhO0/K65ry4ZULq16OQ4kcb3qpxYIaQne66az+8qmZ43D8e3ly9ufatcFdvr9/evDG8sY7zt1Zvbb68+vL2d/S/4/pKrrrzuSBLLcgQtmLrlgXh5DFzHSCymla7P4c/dwGQHwNdAOQixt52t3ZdElUkVfGoYaQkndsfqxCiKVHnc3QNQlKa4SSluZ2pqiQRhIgq+QgDpLABRsQZPCLKEpGXLVqtcD2ita99Bjsfta1FPnw7DM+29gj7PrFlRNxL56wUWZGoDSlzRqQL12yIg4g7Hfd7OXUd+UomZDE/BDrY7DIwlh6Wc48NLs7Bo61bQXp9/NNvvfo+i/z08PH4sa6++EXd+rarAIqVA0fvDQJ6f+899osrhDiMVK/83OODA14cQtZdJzSbKzDdeaktan0pw20Oh4ZV2TUIWbJ/4bZFsWt1UtGUQVU/BIL1FQSpACJdJ8t2RqYofE+JvTupWgdQSQqJxW37jyURCSuAPqBDlZuui9oUbvoem/Uau+2W69hO+fgxV9/FRPSLnuEcLqpoFKUqyeoZNebnNS0JWkyc8K38rXuHkDFgIYAjwOLZ+JzPw6fncPiQAA9fc4nwx+rzXkwvKny8nLMfPBbPiJR7c/hw8Li3Fw4fz8uL/L59MMYrVYBe6qHuVjAcrhgSXsAiYoOReaaHnLOwcNkuBZnVthDVdfMratdIzMfSlQnmRy3GZ0axwjgCPForWfBV+PhkGRD/7fqj6GYVUHG9uq7bqRw0ksfIdFTg2K63uhk2KTIc7qi1gFuWVrhz7ieyDmlV1w4c4mt1x1oHP9ayTl5NsrrBzeqjOmEt719bn/9yq0HHcipYzAVaKoQs1tTNGZEhVQgJGIleZJGPie1YkW3Yf0m/dN1gBwRaHcjZVixzww9rjd3DsQzF9aMdpxFjnhAZkBrzxOpzECln3fELiDYLiTHU0d9pcQjRq+6qu+1rK+POi/k7r8Cp0Sfq96+tXhveWL2x+uL6i5ufWv3U9WvptfWSvemWLEhtxWu0AI61FNkIZa3UmI6+GTCsfrL85A6E4kdXF10A5KK//q+HbrfQrtO2z15UATfd0uL8AYnd0jFIVUWWTIguWZOI/bKFK6Wk+iETn3leodaiGdja8OYMC+CI6D6vDcl2PmOQQnyI5uvyIRDykR+Al+cL51kjqbXxRRSpe+QCIhYQ4rbomOUQYre3nd3dpTG2ZA0DC/ARXa/OCs8biHiUiKW0TAjM/SFzP9o6DLQMSOue9WkzC9//7EebwyEy/5vR1lUthQNiF5BNDg2RwXB46Fae2RgCPG5vq71mqe/9vY/YPXkypAVE+oh+XmPYQbECSWzVevJE1yK0nG1yl3ApZqSd1dNQwqQ1CEmqtTB97qTZVShp2cClJgpu6UVUAQEpdAuqtHrpuqUz2IvUi0snJZGw9QA7j51qRKo7Hu/m65Lm10es0L9ZrQI+0OBju91iEzByfW2+DS1tv/71pxt8V7rIikmDj5YBUdEKH60wHR+iuP7Mntl3pu8cn43PHCRe0Pe082XFhWd4eniKZwfvW3X09fGpPPNrC5QgAKVByMscEPLSX+vAkcPPy7PpaXmaP4jp3fllTBNXMD4w98vR4COOpCl5fMh8SGqZDRGIUNgKh0nwvIsRBUI8iOfw8RFT24VkG5cY0bIfbUbFZBPd9Zpj1PSphxBy9hf1i/sv7r64805R3bKNqmY2PEqAR0BHrD1W8FgNy9wSTbLsrWwdqbDUvsgS1d1i4EmKw79ydyVXPT5EDghBdAJphIHlDzmHlIdliwqJIxTwcb4dq+tqTKs4ulWtCImf0CFk5R/ir96St/bnWZDMXG2wVsdhNGIBCJAP27CW15R73p9aUXrbhjXZlJdrxV2hpsWAHIImEAwySIWQbhtF+7V4P+z1KtV3q7ntsUNI92T1pHfXOTM/sfqJ/VvprW2HrjXQCA8oWDIg7lIL0TdKXe1st348Pd7//G/8/Bo/0rroAiAXALFSYCKQroOIKEVadqG6SUKqVNWHTEjbL9/qRKKOZO4eJOv5Q5kAkA/NULSvfQ4hC3zkZW05z8BRShi+xifIfoSkwUUY5EdlQl7tYDTPFhmGVJbaEHcfsRar73YBIV12CKmdsgJCHj2K8xR1IVkE/KgsiFn4DEgWmVmcv1rr0Saf2+KlJqRBSsRzWPjk8PH9kioQWbTVSmIL03q3043D2zZ8fZ12/h567HaxfvPN7srhY/foka4cNBw2usHf7y7g4+6u72N9c9N3LbrT9fWQPPpzhrC/ZojnhgNE+rff7jZ3dzoAKFP9tV/YsruY0W0Mn4HIAgkzDKhKFyCiyh6wcCfCuBau2xHnDEU1mqVJ1A0l5wfMBPNEflOgAv7ShUt6VQwAOhEugCLaXh8Zy1UMT+4qfGx9vXNv/XzrMLderdR/TvNtalOHT62LihWN2KETtNobQtRUEvyoTKqKRWddnYRkbd/77enbo2dBpqfTMzpQ8IPTU3xwdJ8+wPvH9339QfX7h7oOGMHTk3t0QInX5Bd06Ah4MT+3p+5n+VnAx/TUv1qWqcSH4EHWaaVDZD/O4UPP4cPVtmK1kiViFgsKWuGycY7tqCfnn6JFPnJmSWE7CpaZJWGbykQ/rxAycixP7elpwmT4lFpjnX5u/XOPAz5iQGI4QKPOLOk3Wr0K6KhzS2rGo4HHq17KqluUpQBf/ZA44jyOwJGd7oYPmz+iUDnLgjSCO5e0D//1mFdoahRylgeZQaRzAIqjm/M0C4QMu7RbPUlP9ndyt25fq8FHRBfdrR1vXRNky4K06pwTT1FFNAaMTKzgUc7W02TTAiJuq0cJkFTMndUCQNa6lqiZcTDSsP+dJB/wWO0QknzGSufzVgJEql9fvb766vqruy/0X9iBWFmZ54IQHNoWLBi2LKxzQXR0lrRh6z/rFT5GF13U4YdaF/3j/3jUf3SWUoaImoi5larmrmDCMKqIBiGA1HOPLrLvkUhFaNnWgmminE6m44gyz7HAx9Ut0AwEWpZAKxQtoKIA7GFwn/DjC3uFAOUMbtrHhXaNJOp9L5eazsBG0HVCVbGUTDxK1xWkJJzBqw1DBLuOKaCl73l4/rysx5EdKTKDhqCBnGqchyUiI5ZiSCm1WhB7KEa3VjjvYsuWtOeFCfBTwsf3L/sxZzWka1627aWzugtroDYMog4KbnGQSA4Xqg4nabdL6k7rdQqIUX+epFoiDCzblWyaiGkyGQaVvuYkBAuAcppgL17Y6ulTjr7O/rxWFyqq5hZfU8zo0TyKANbAQUVYWpawFIiIocGESPXUdUApWlpHM4AQeXgOCVGdsx8iDXKg+vDpkGZYTJA4L8Zn16nOtVro3A4cPPn5QRVrP/esCNd+beXe/q7f1a8APMcn1kVf33xdfvPwm8QrEoh06DSSXRm5Kyj9AQcFEFCiy158IahGUy8Qxzv5namXfiUQVL6lBZxgLCc5pFXtPqWiy4xLtt9HY8oTolj9MN3Tsx8BI/Y0Py3vlfcm73pVq0lExXr2usZKJ04JlVITPgo+/FBREYRsHlKXmUkjrVhAAlqD1rCZ1RiPi+vjukHV6eycP7aOZbQpjuIO6LAxHH8WB6jxfb5/bKki/BY6h5/X5DWf8vFkVYvF+5rp0HW3TGkfqttk8QoTJM//Q4/mcwjpShexzSlpGaIKH3EeoLHCKkU8z9pEBUmAXms57G4Qcq7WhWo+uESrayFmn91Tq90pXeoCQSyn3MV7uLIVN91myMx8i29ZoIGjaUCEJSYRyAyXlCQQc6mvaLTz9rjEoihIFxOBYpYhxDa132DaupZVLyUhCpVOavaoQkhsYVunNaKeZskmaacdixVEowQ/Rz/19TWtnD1aR79r725BbGE4mVjcy8aKHancMnOUTk4oWK3LevcLf+kXtr/4hV+8x4+eLroAyEW/5/fI4R/5R14amUykFBExgG64hR7bBym3gB5UoQ81FORSLgKpqkFJqBlsmjSNI8vppOVwMDserUwT7RV4aGqAARHyLFNi7romP0n2I/Tqw7KsPx5eXgUZ1eplYJ0Wjf8pFvgIMwwReISLx5cvbTOOTKTIWSG6W6CKBiGSMwNoWrYjvIyGV4pQAIOIorXmfTX78Unho+n7NfG868ShYe6oFuvWTa1tLwcQkeQMildXkNtb9WxGOCWHD93v1Z3Sdpt0s1GJuTQBGF0nogpZhjlqzrRxJLquSECiiPQz0Nbr/fHY2Qcf2PStb5VDZEBUkUQkL7UVYYkokgywJKLiUZdMmqASCSWlCoWSM4WkYJFIhZjicem2JVwAVB4GdtqCpGyfYlJcd7frLlCEAMTCSz0WhmHOgHQd4d52nRxTwrIVSzYpyTqyj9utrL/8ZdsC1E9eC3LRL42/xJ/Fz+JcyY8efS0djtMOXZeR+4S0JgiFSkHhxElOdgJZISQ5NNgWGyrUCksa8xTwgXXaYNUNgTOtcBmlFDQIGPMJUf/hDviIzEd5P3s+xd6f7uXFBIEtH+h0wKAkFAKqaIMPaR+QW2y1HCRBJU48tW5KrcVvAETYaicQy+LXJa5H3cRHwceS3UC8NqLbxlznlZQWT374z5IdoI4x0YQgP3LHqLQgcg4pN91NbLhKbVq731NkCyKGpbqfo1SIt/bh/pUZTIazovDWIlfc87nE8ZDh6KVP5/DRtjJFvsT1oZ20SVY3AGjJpOZ2hDwKBBpKgToaR41dAOpQhqi9YNbMKU12zevN63w9ErdP41/IhIkqysQEc1GopgalknGWSDERKtG22BUUHnkchXJWjIk5+6vUZClotV2usWOXzjt6ddqh175CnwNIfd/9PiOqwTDkWmtTgcot7f0meIUToqJpD8FRVCYa12KyhmFjsEO2vOqtX+Uxb766+eotgAuA/CjqAiAXkZR/7B97OYowi6gBVkQknAF6hLkzCSOp4lrAQ5ZMgC3bT2TJCsgCLWImVgptmqDjaGmzEYcQVf+AXgJESuGrdNBEsmX82eo66vnZ/6dU+VrJh3MRnH+5V9d10b72K/oYMBF0XWeqRRbw8HX2dYUxpATOxfst05EdQrg6ndiRlJYFaUXoItKyMgtMEBEbiKiSIi0DYmjAsZifdoo4+f2b5ZESNCaJr1bSirdbJzUVV0pyth+Okf1AZDyur8WdPPNRwaPZ4SOpQ4hElqTvWz2FUAS6vH+p6yg1hSECUpAz0jSRpxMDgLsoaH/vPTv6ecDwGE9tILRkIlQVS2zgqyJCJXFWZ2qiihoftlWFRQDRGVaUKYm0yeskxZU81s+JM+ygwhhcZpTFLikAJJQSsFqJRKZxGCL7Ude562QV7vsoho9IhxD6Na5vb23tbbb1F38Rhk+mi5K7IBRRIgwYZODQKbWjsCsow8Sp9iZYCoOlWJGOHRRqJ54kMweMyPvlg0KgzzbhpDHj41g/sK27NWoGRBMUQiNRLCMyIKcy1sGDXoxuz/Mzey+/n5/x6XTCmEUTk5AALCGxY9KJKu0I4HC1Pljz1aQ1umBmAMGDHbLDARcHNITllE/Jzbi3SSeOMkIgFNfZnG0JUJrKw5T2eI1nbYo7gMPqNV/5z1G8GD87RNWWwQWFH/ufLS5BSIFIyzh4W9ztulsmtKehvne+RgxOXGAkYm0jTBKhj8uANJ/NLuF5O+GI7ftvse2iBxkWXcnVqoKeH1UQNDXAOIMNAyE1q1RMjG4zWR6X8FmhepuGGhkFTjp59KP0jPO1rSMrYje82RSU8pv2my+OOAaM1A/6Ih6oEJ5lQczgES5xs91rhRA7jlCEhrb3wMxSJ50t9U6sTzfU7BCNIkngB5dGBhg0puXXAv6INSulovC1DNOAZYtbFkgPV2EF9avfmH4jH3B4abSje0XjppRytGJrZm6QcCpaxmM5bv6rH/xXN7/v9vcd8KOniy4AclEp3Ym0CcgZkPAUl0mp5/OWKlIETAlCtu5RRN+3YmKg66pNFpGwnMVNG8cU0CHDQB0G6P09AkTyOJLAq6IssCANKvoe4q4fOrtOWr0K5q1J5DjScgbDZkvWWCAt6+F6+I+wfFjHKPmQbVz1vAVRTfHzmuoMQW7MkSpCiJhbKZLYdYZnzwzzdizIDBzEA4yQy73XLIhHt9gDgLTcuC5b0oRnrXur28/zgzrzQxUS7WoDQKLQ3N3PLZt1ySghiasNi/SI7Vbk6kpkt6vgIdut+rpb1gEgYdW+V7TOU+JaYEe6jlSliBRdtjPpNCG5GfDx8mUqXjfi9SG2+va3y7EU5HGkipi4Gni0bET1fJ8mpCyIaWRL1YEVxtv5gsBKiomokcZSBEt2R8VFzrUl81YvdDOsUB9qhkxc1ib6L8X6Nfsxr7l00NIFPsKojvOUuO57rsi0Aj7oAGR8Ml00ulnNrNl2eYcb3HSp5rzYgegmTElFU2HpRNrfN6OMWSoUoEOWLArpo/mpZy4YmY+t7OQ+bbDOMb5tzfiQlpYPwcUMmRPH4rb48H5kdL96Vp5GA94ySbGUkgBUM4NABQRFFGlJoLXsR4OPWIdj3QrOVZQGQ2CHzxLJAQuRafF7ss200cN4sPgw2T6ECgRGY5JEoYiZYco1yzEPS8xHm7eLBdIcLEAkHOAR17yYforv8838zZff4XcOID6Z2gZTAfbY97H1aqnTaAXj88BE7eARfl6jqsLMXoWOV7Ifr4DGWaEi5LxwgzSaHXDIONNa1jXT1NrwigoWNUQT4zxcsoGb8ayPfPUCIzAQlLBAGkhCXcmluUJlZGIsZgOvuLKd7tZLlzE41L1oBeliIsmPwqJasdYPCEgPBkoSwZkKijUIMbPe1MxoLFJURU2hZ3vJBDvuWFg6uuKxTjqpAJJWEjU5AdUBgyqKnj3jvpdfBLX/BnUNzFz2nfydk28wDAA5mdnG430pZZ01n0oug6n1DiCrL45fvAZwAZAfNV2K0C8SEapyAjiR6mYmkQEZZ/iIx5DP2pUSiwICuo4BFbJaQWPytLvbbpF2O+murmIPv/oe/tRdX2vv0a2+Tr3bH69tTFVE8CoAiLTICh7brXiRcWzJEf/wKEMUE0f0ImV38g5JKa71+33tTLR8zY8fVU3Gmu5X1eAFTdJqYVSVc6esxLPZIWW77cpuN/vqKuX9XrPf73G9lizCEMywuK6lrUshyLC5W/crmHtZ09wLWLFlQT559uP7sPVKZIaPOfNRW9YOcwakbp2K83q9RXe/Xmvv4NE5ZHS7Xd1u5VmzLqKu112sJdb+fktLo7zquL5aJXeN8TqN1/nXlvn1mmIrV/x7nDNWtFIsTxPdtSA94jTHUtwuC4GsTiQqQMTazDqPHWC9WelKKT1gg9tjGeKxcDyvlHh+6X3dx+MiHAB2QDxe0vK8Pq6FVeGuGSN367rFbu7GpWm+1oaFap8SVinZOiXpyYA+WwFdwifXRRlMKZkmpR/m8KG3cttd4arbcts7OoQ797CRzSriwKGvv4vnqt9iu4rrW9muegydUHQsI7yYHO/n9/De9K68l9/Fu9O7+Pb4LXxn/E7Y19/mt2M9fQfv5nfo25XopeccMQECdknRpc7dI6VO1M+hoLvNlwjX1avwofMBWQRAjBZF7pNDQ3GQCIgwH344++SeaiwxlySiOzp0MR53sGCASjjOl2vxNWKrVawjRsvg7D93fmd85/4vlr/4HMSnF+cMxCBDG6qIBljNbWBi2+rzSX0mhol6NBiJc44YTaGCM8VEkU7mrW1or+NiW2AjbNZmjWPZ1nZeXyNGa1mQiEsOtjFNPbSbj+Tue+07d4wsXG10M9ylu63PKtkPGBJJLHVIrGsXLVZ1zZadAYEPg5CDHU4ec4zKjBqRyId5rI48l5+Xk52s+LGAGUUFc9eMPrJSAR8R51qcfq27YZ4+H+2SfTZLFw0EfH5L58Xq3ZPhyfpJ9+T2ClfXNA6FpS+lbHLJ64nTKrZhnXAaXpQXa+/7tv3T7/3pFX70dNElA3LRONoxZ55EOIpU8JhIGUlO83qeRi5CmompUlOCzIP8KF0H9H21DINY38fjpLjMEBkPi+sR5wwGS7wmJZGUDD61OR+PZh9Wn6EKbDZIATWbjbhR9/6nNKerWQXkrDULsl4zHY8s9/f0jItaKcaW4XC14vSWxXlVbUChirTzc1iRJaWv9dJs6pz5SAbQ42xVFFWJeBIxnk7ol0JpkNIyICSF7Xt2XVIAaoZcikks240vWR2Pnz7p8f3YerXMlulnaz+32VWdZ8d46KQVgIcABMSKg4JgswlYSHBHDJDAep0kPAwBGorfajZBFKiXAskZ/loGiLgtCtjLel0cQgJ+JN3fcyLnrljzlipxU6bJWrYDACWlerMp1mZUMwhJt0nOVmGSjEgltcx1HWoi7Fqr59lIInSLAnSLkkwA6/2aLZseoEvROTAPA43YOs9RZ/jXCiB+bUiJg18bVLEC6DEgRH0GyjQAeIlPpoteA/GBRwO32KofsrOdUpkmmTRLTmn+15AMNiwfWLWgwMQ0ST3+/+y9VZwkR7LuaWYeCVUNgtGZ38BlZsaXZd7nZWZm5qNlZmbGl2UmLePle5h6ZgQjtdRdXZAZEe5m65+72S+j83ZL1aM+mrN90mKszCMisSqnFf/8DCjTzDN0EMtSLOO2MpappeLkuo00QidteZt9QrgSzngbWzP87J9HSuQKRuTskwmYuHDDYnXICPUDsXtsJAxQYWU8Zl2K1chXejXXrlvzVvrsixWvis8PIaau1JVqc5olpVRwrF1M52JTKCDTHl4asEwNXAq8theea1vh+fH8ePzm/M2rJ/ZkfAZcmK/4+MyyCF3IQUqwEl6kTsWwxMPMEno+bBzvU0+JVMcFQsRWqMTckkAJW9bFI+HIU91CPYm309WOos0LF4L5hCcKEEF0h1qBZwgVhLwNcsz/i/oUS9L+2TQoC6VuFXg3/pob/tTmBDdAHdFWzK51LUxsbeODCmLJv1s7ghCAB+ACVTQAnYGGVoliMDIu3ArLeUoTT2VCfRCASsxLQ5cw6IoN9iUUJosZMVRS1ozUPazPbLI3suWrUUekXLXp6PXcZpRxSzOtJ5lWtZZqc6mXZ22e4sJOdrLTt2uvgP0Jf8LfgIuY+9Nkd+bZzkvRs5ytut5BVLVtKbbpF08wE0+3Yk+NAlTUiAu/ti+bDSLjNoAFqs5Yi8BDGWeKAt3ehteoWiTVwpH3jjqAqqpw/XachrMzSd051WNYA0gEPgzMNTrY9LpLn7OxfFzfCQ/FA+8HnZXw2CTxHPhGHmsoNTi/uL1hIWKhIkU6sTIf4MkPqhnhtYjZoVJ/GKScneGCWNr09frcreYmZwvJn6O+2dOGudc5YH0b9eO7lnoFpWED1aM6FKk15n04hAyIASHwlLDP+D3jfi3dylOumqP7VVWYBDCyWrVe/sscbsTjfYfTnuLmE+QpZ9VxVNvtWtSLizzd3FAOQHAolZ6LxRyfmQBposOAQFUAg0XEY8f+YmBdi+EJjmO4jSspA9bVUynwdow7fLCrbUIA7urpkH6FfcEx2mxkqvvwebWisR7f12NXdX3NTNf1d/fw3/13/97bFnGe7C8hGfbD+k15c/OGvoGC39dq6sm9oQz3yOh+snSPldFO9C5EPgzK7zNY07qeGwAmcDZpBetkNqiZqBZR0wF8G02T1LdiBcACADE1BeJaNACpIXI7lbkfi+/a1XtW4RGPpp5jj0MRwH60fY2L/viGHpeLKBeOwmsvTIax9kvzVlzu3bnM064AHVqjIlZlpKkldZZJqYMVS20nnKvXSSgfjQ/GB5ffn7//YcDEEXSEHxu7t7t9Wb58Xidtn8f0c8z8qHpTG0J4tmkF0NjHoMGngcAsYnikPyE9ChBlU6+3gSu81qsUJI1d5rZN75X3rh7b45HcNryR2k72bv0Wf1Wff0D73816057fhx1ypIKRUaRcIQZ84AJcauS6L1gjFnUwsSNACUih+LbKGOtFM0iJVDmkYvlcEse0tjHMh0wi9h0mehaI4NXWGLqNzdQnpwNc2Zi3bUTjthWYr6XPUMF+NAOI1DgvpGcYLWzRESyK9Clrnm7s5qZlWrDNSdI88DBToomZ5yENJXOe/rN/6D+7opOd7AQgr5b96X/6381m5d442h3Vcp4znc2zNS9Fq9OmFB8e5Ok1faaDOYSYqx9E8AoN7ADigw3NI8vhohxmLIsBsvPsarEb7lNTqoa7d6nCBzop4SIVkVqEbzY95SpqUVKigA/y52SzUBDIIgkhHNZb7AZ0SAUbRBpqHPD4FRBQSN2Ul/W6PU+1DgMdRqKGxGyZrhW/p77mSLsSswZIdu8eBhwmrWlbBgBBfUkpWpACREQLjSa6aXEMMQy3n2qpVzCoHpF+hRSr3npXAj6GYcCaBNEn6Q/VkcIHAAnnDiSp+kBIn9ps2o2fV0gKX+5br28i64BgDT72+6LV7fq65E8+yfPVVVP5nm5hwOZw3Ez8OPtEegJ0mPX5HdhfrKOAXA4zRAI8VAJEVDWAgwEiHWLaeSYSYxYVER0GTOcX6nBNDT7q2kE51f12Lq/XAA+uLruU+Kb6Vb3vdd1/QjRc/Dv/zt9T463sZH8RcU25Wv8c/TnnX7ev37ln9+5tyuYuK9+lQvdI6S6ycEztHhPfGbhVNCWHjyYOM7OweVe1/vcWtdLmgxiRPN12oYEIx57raFg4eFBzZjJn5Gjmatr7HLVc/YCPGsVjqAXxLTQsaitgpNZThJIltBcWP9Geyc8xLtQBH9McheYNPtChC9AB+ECallb4yHWgotZ5JnOddTJ/Mn4yvj++f/1759/7cDH3gxd+a7sv99df3379LgCkpvWgDS/AAwCC9ruYmcEx4XwJHLBlVNWIgKkonocDPgreEwDkar6akZ5WMWp6kB9c7GhXFgXoq69tvoZhiB1A1mct7QhFbu3ie2jpYKHOL9OxpGgHjrrmgI4AkGPwiLUrJNyibz4IE5GIo9CeBYeQLoXjwoJzzMJhFDFYNABvYUsVSH02CH5Ds68L6l/qbz+tpb9fdL7yFCyujmPRzhhOC/aN2pr2nsx6hFfDc+z3tN+LyAzoQBx4yIAQFLE/4SfjH/y9f/D4zt/7TqaTnewEIK+O/av/6vfqN74x3Z2mcqcrH9RUkHkGfDQFxAGEVr37T4eD6kgLiVqQBYQYYitSPyge8JgjYu0YuS06ENE0dQhhBshAgSCAR3WCSz02IGLfZ0G48kHsaourLAxvTxwKS8CNHwtvAOJA4y4DooMHniNUFq6eXM0Rb0fsYNM85nYgLp3ZT5TSWxRX+KA6dM/qxXWDkM1G8L5Lrz2wrOokYwQL+KjGVkpAA/FPtdQrZhSSS02MP9R2uPqBtdczcKreoIOZxWHTttuADyGAR3iFD6kO9WPZx/8YOI5c2Azg0dzmWW2aoH4UvbnJpQJIubgo85MnOps9NRiTPS7Sw8gjAxjY63bY7AAiZgTHuRaZTeI8nNnSQRVR6ZBCKc7H80lrgpm0RnM1j/DZTgnAFvtIY0zUUyBprj7WczcivBORawBIvc2lCF/nbJ/8+//+33dBt7OT/ePEb3zyxuote2v7c+jn3NvY5s6gwx0ASIMPozsAEEQmvpt8KD5iUz6ioM1I4ADOPhukIMKJ6Ole4tq/De4T+PmpmoRIRfIV456R5IPzimPegveoFiTiIi3J2yXA/MK4teKd8lRWtEpsDNyJi3Qu1jtd1fNN+UCdB7zVfEw7wIdVxQMAgpQr+Az149H4aHpv/971D88//LiqB/vvADrC4qJ/jYt+AEibdr5pM0AE6gPmgEB5iMJ02DMg5Gn1I+cOH3OHD9S0IIUMXtWPVrdShz/OH8wf3DzQB5fLFKwvD18+/57V92zvbu4OUGCgfsABQCvvL44L8GrxnOzpV08Bx6zzUvkQVcU5OkrPavcN+IiidYePWC8HBTfFQ33MLQ5gHw4jZ5JPA5CwZR+vABPASHW9n+6vAkKGNIQSwitp6ofUjXqbQ/F0vkgb6LDt7ZvNZ8iYksLmmqZ3raxZSGYWBohMJjapKGpS5gu+mP7ff+j/3dPJTvbqAMjJ3q59Ov+0P+1vPc+5IAVrm7MCQrYOINvuhLiJ63cR8/QqI3fuMAK4OHjPHrDFhXhAADzaAy6/pTKCEoLbAjCgdtRYHbUkh0J3Vz/EwUN8HkQoLe7xnMxxEX3U+pdEAEyoL2mPKR1A8BwRJXVFRxx2iP25yK+B+aAk2AKobAk6jLU7vtWWOrGbqvKBC+2mfqTELa07ZyqegmXMPunKhHrOBdfItlBB7KdO6lWoHwBEWSMCPmJCvkdXPziJcFpelIhw1H9Qhw74AEftB6EOZBhSwAfiswBkCZhYGeAjAGQcCxQQwIcDSM6Xlzp3oGOL9xrqHKDvACH4EYMCcS7qgkz87yFeH+K3C9hoa7zXKFyP4zjmcMJ1zeJpV1rdIxsgv6t58NYAoR6DR1UAWvECPKB8yHWPfFkBpEHIZiNP/q1/6+/9hG5nJ3ub7Ot/+deHnzH/jPOfIT/j3trWd7jwOVxV75rZXea6by0N6yxx2lQHgAgTu5MEhAR0dsDoiVfNmCINBT+xjqNMhwGshsWyMaCZhZirB1pmEmxRhM6JhGNrB5v5k0QKDKxN074slxMuyvsnrtV5WFMJygxXqARTnqLbFeAjVA+kXEH5aPBRPUP5+GD/wc2Pzj/6uLaJvXkZX5IkSvy14WtdAVk1BUQqdDT42Kw2aTU8nfazSMFaeqRe0VjGXsOSG1SVClK9diX3NDIASK1dmfAelulXSFf7SvrK+Rub9jqa+oFUsHVqbYCpuiTpKaJe6B/Q0yADHqlXx+sGHxbwUWLdoAOO/d6mpK8RjWKLZlfe4t25FIYY36QEiB6rIDUa+ZI+w0YbCxML5rI08JCueAA8qgNECADiwy9j/kd8/JaKENSaSDnTGvOo4+6GbnYsPBnbJCJT4pQnmcaJpvnH+Md2f/pf/qdP7/xj7yid7GSvEoCc0rD+hiHn8to8I91KK4Q06EA8q3FdjzUVhCjalC4VjgOEYM2s/iVeiwyP9TIjlBnHn/6WH9Zb6bIBDKqjniTBt1uAAtwkjnnalV+LWqgfLXYLwIFxpOQY1jHVGrDRndxZPLrqQgCdqDPhQ40JIVYjOMUkd+YlhMDIol4Rt+81DiiKlgofTf3A/UzV2/RXS0k4Oh91cCIlChWEf8p1vQrDwMF1z0ho4HGUeiUpSYr2u0fDCut9hTqEpBq7VwChDiD4ZcgSOGL9XA8FZJoUrgCQmxvVq6tcrq5KqSlYU50HMvW/26JXPiPG45gEgYTDDg0F+rGIzA00HEy6R9es6qF6pB7Jo/nzSemNBxixpEQ+iZ9RC1JjMhHAh+C4K202iVBTPkQYKVjXAJCU5ImIXI4jf/LLftnf8+Sdd95WupWd7Gf9VT9r+Hnzzzv7qnz1nqgAPM5M7UxN79R4h43PQwURFgCI1JgcQA6wah08jDqwRoF5m4VxNIzukGwZ+p1ErlbgBXFsrpHEikna/aMQ+1gFiU/ycfoVYqgcSDfKJSsrS9FCOFZjT78qDT7U1QKNC3akXVUvqPd4PD1Gzcfu3fHd6x/JP/LoQ/3wpdUdIYWrdns6+/L2y9sKH2j3mjBzwms/xOGD60aIMFU9Vj5aZUOAB95P1K/gPXkRfQn4+GD64Ob35N/zkBaGwmrUf9T0qzXUj8VARKgfiNGNi82M/e+N1yKuaCCGQwVJrQ7EsqdcHbmFP62GGBkvCtD7StVwHBZ6LtAFcQkBJMTHKkhE4vBPhxG8otfl9fVWtikm71cnxFQ3Sb1Fbz23VJDNi/Qt3pcrPojYUIWD/mu7enYiJqgfc5EyktB0k27GD6j+VdIH44N/7EGmk53sBCCvEoD8Xco83Z9nPR9H26DuA0oIYMRVkLoPALEh/s0SgRvcmI17VIIfoEM9R9VC2GWsF2M5osgaxyxSj/qUcGIASAcRQIcGDGC/RktdZQnw4FBb2H2ptrA/J8dEcdwAjwUlpQMOJ28n7OtI86KYug1gkeoLyDFeqDtcimm8pzjHflKkFw/3WRa9qxPgA4+L+6iaUxrUlV4jIc3Yuy7FUDz+KTdwMIYOovA8lA+HkEi5cqch5ncszQftOXwIHEpIPYb9YaGAHCDk0yzOe+qVVm/1H9fXgI+sl5e51oCU+dGjEgDC5ObVnVGIbgHdMIsPUTsQEMIO2e1w/AwwiZQreKrrSMVq0QeROXywe8rMnEUAHeKKx4CorpAE5Fp13O6mOiDkCiDCzE8AIKr8hEgef/zx5cU77/wDSreyk73/Z7/Pv0Z+zdlX7Cv3yWhran1Ks+odM0MK1hkgxKjByAZM7YXAsKAGVu+KVDyzvvjl1myT4kiMojtcCMI5JnILonCyxMKJ+k8cYXYYYSLrUbmZGBAo0MMjxz9Sxo4fASA+yRyggW+2v52/fVN1jElLT79CmtKss46lz/tAjQQu0tHdCqoHwOPR/tH0cP9wRMrVj44/evHj5ccfX9jF+DLTQ61ub8lbZ29t3tqi7sLhg+Er6alXi/dK2IwMPwI+egF9HqOOBQ74iM5dcMBHQVewR9Oj8Semn3jysX28p4XVi+7Nl1dfPr+7qulXq/Y6DsXXw6qBkPRueVFLwabGDUKseQKIuOKRvDUv1nwMHoihisAXj0GFIiUr/KCG4DjHRb+PsY3vU4TlmSqIA8nTxs8HktlmxXMiFQtpWA5+UftBdR8xyuCFmCweKYAwAASfsRrh2KZLvbze0a5NSCemBiAllbEqI+PH8vH829Jvm+kfpYneppOd7AQgr4r90X/09/K9e7nWgbTOV+vqG1VAB6Eb1hZrKCHwZVqRiC0uhgI0FF4XhcwOU19dFcBuqBLLLGdPLWJPleJ2phffauoKhMkwaHOR7l1FMXJn5h4X16FHU9AtpmNbNfa6lQTvwGEDooNIW3sRMKcUzuzvu8bmFBeSHUIoJCAnlFA/pEEMWsJuNqnGuKheDjyMlBuRYehXId24ORHHe7CXOnDwJYBKdLnyiefJ4cMjlA84J+ZnwQsDQBw+lgpIh5D1eiBvhfsCr4kN4OHwYbsdFJBSAWRG+hUUkPnxYwBII2Y+ej/tGOxQy2oOHd1hIiTLlL7ochaTz+E4ZmbuoZYEvCBycfUjd/iQ6q0OpAA6hiFpjXBjluqLpzOe6/qaWS6JmgpyZcaXInJRij25uLBHv+23lcvv+75/sNDt7GR/IdHPpJ+5+TnDz7mTLG2Llq0WBYBslfSMjM4BIeHCMkTR7xJCjOxQ9M1a3Upu885za2dAwv7tCan0NJgOG+wXcj2RhZpT9KnCz2VKDZmF9FY9sv6jhWvcKj4wAR8RsWXNrXgZIwUf2aPxG/kbl1yYMccDtRBQOqBw4OL84fhwrNAxfzR+tIfXdKvdg+nBRVU9Hn9in+xRqPyTUJtmmHXxmry2fW392sqLnRuAtIt+GAu5cagd1XuxeW7F5hTgAehwR8erBiB4j6hf+WT6ZHpvfO+6qh8fR+1H2FfTV8/fWL+xQfpVVT9SgEd1jvQruLcwNnW5WnsDitRUDFUJJQQx58yhgAR0IE0sQCTb7wshdY+9exr2AyzbT29oIBQCqX8AjE1jFoz4P6LcLZb0aXYMIxUU5tfT6+sNbzAOMt47RRvoGtuDRoy0v5iG7vUwMYmfZm2zRjCPZHdjNzujVvsxmlhLx9rLfnrM9VOoj0fa0Uj/CBmd7NWwE4Cc7N//97/X3n/f1ihEn2fdzrOta6wAEuoH4MPWqrQxWxaQB4D0ukmRUECiCFDhbBb7trx6arGDR9/t6gTW/Tgzakua+/wDSyLKIrivulu4IQYIUJinyDjcuPf2rCmxHNK8LPU1olUVpO97+2Bx4KAemWNN1I9HWk50XzooMGIi4nNTUEuSGI65GCkxLS8omTkK4wE6CRGO82HFBwD8VFE/zOLvxMlnf3ir3YOnBKehwxbzM1r3Aj4AIdURA0IAH5GClV749Y9jCfjQ/V4BH/rkSQaAzB9+OI8XFzqaMT8D0KxDCMvh7AEqos4DIWp1UuJo2Xvc7GChWuFYrHteAkAD0IFYPTMPJSUpASVd/RDtn6NgmZgjwxMR3wBAmOkK1wZmcgEVZJroYrfjiw8+oAog/8AJQG5r/xTxG4/fGH4J/RIMANly4TOoINXP1RTwASVkW+O2xjNmHhbfwMtyknZ3NW9vCtYtpTdtVgAHC2vU/iSoHTJokmT9Us5/stDgEBLTt/0jiI1jHH8Uo7sz7EgViPqPKELv8y40axs0Z2OZrXeswrf/tQXtde0CdfkwP9x/3/R9H//I+CMX35q+dfUD8w98Uo/t6vmbb+o3Lyu07GeaY0gt08s2Jr6261yH1m3eXL+5gQIy1E1YYu4JRcqlqzrwlj4W80oAHrtxhyLzXnQ+tQ5erZ4F8PFkepLRvevh1N7rJ7UgeqKFnfP58JXVV6B+rDGVvakwqw5CzYdVvwBPic0s2uZKgw81tl4H1MBj6VA/cnkaQCLCVZXimKdg8aJA3aHkUJjuwLOED4LHTsgdLLw8hvXtu5Rxd0zsvyf3kHzW/w4shBi2/OwtOoIx3P8+cNTkIL0PEDLXqqKbK7q63vN+z9xUkHGWeZx4mp5w/SvRk5k2NFUAyXSyV8dOAHIqRP+T/+S/jkrh15By1VUQrc6eimVbVVrl3OIQqUIwn4mxVEAi+i20nY70FXjfh7X9FiNttxSuDgCxSN/ilOAqcC9ud/goDjehhCAuS/CWqUvmsMMBOzjDUFaOPME7+HSVJXxZZB5pV8sUiuV8jpxNcYO4iBXB7Aa0T+1xGCQKSNrjhcVtHT5kKeU4RBleO+ICFL5rhefxuwB0OHyssEatB5SPWDtQyVLtifuLtOGBgA8HEcSD+oEIBeRFLGeKwnOF+nF9jdSruQBAHj8GgFTJ/9LmBQDClgkJXvF7gM5ovI8Q4IH9gI9IxCE3LGN38fGPY4gK6BCRIrKaRYbsaofWdWFOpadhDQ1AHFqiKYHVOBIRAORKhK87gDQV5PE00eUHH/DF9bVdnQDkxQrR7/9l94dfaL/wbMvbM1HZQv0oVjaoBTEy1H+cAUIKFcQ1CzMcRhQW+i+pevNmpVIahAgUEFIWNh80Z4MkRBq4FfJaz6mvkRHF6pqwBsMzJ2qRyJnHLIbYBYjwwaJdK5tbKCCRgjVp3Wwq2bLRke1pX2LSNiaDGxntbJdHGsuxSvDSAYQP7WHxnF+SL53fGe5Ad+j1LcINykJxgvIBBcHhA7UrVCEDrYPR6crqOupYCiDkam41LICP/PH48R5zS75RvvGk1eksrKovm+9Zf88Z4APqB2pPVqmlXS2Lz+PPD3AIBUyMfRaQQ8gCRNgBBL6siwjHfrTijXOxz3UV09QPMb7s82a9fCiFlJj9EdPzaTHo6FgFuQ2M4O+B93dH7gwxGV4kPp2J2M1VQPbUMqT1tb8R4pR9DkvZ61SmUmFkvNZrAMjOxEZjm1ETMqd5zCmPdY3P3Uz/xGko4clOAPKqzQMhkYI0rLNeiE5QQTz1yjaugKwRiSQ6P9niIhSO9cKV+zl1SFhepIdiwKYaSoggOoAQjjfr09ef6q4lDiFwOUBIh4OIOBbwEbM0fCig4Rgi1JXeSUtdZQnQUfHXL08DTkBH1Hgsn9fY7NBxC4/flRJp85OrAz68k5bw4uKX4a5+wHF7V10EpyKdJyBNSyHFse9u6lXUu7RJ+KtotduhgyMNS7COyef0bAsAqRGeHERS21+tEtSjF5zwTzqOuQKIeutdAAjgY6rpV/P87rvzzTiSxu+W6NmPrxpDJy0dgEOqc7yvOLZoOX0ADZFwocMEfsaKuuoxlFA/6lr9mDK3CPUDx2yRRk1mDdJLXc9EcsXcwUOVL3OWx7sdXTx5Qo8fPWrHKoD8/YVubSf7ZX/BL5PZ5tV9vr9NljYAEACHmp7B25p07WlZG2ERXra9iM3MwUOLugKSOedSncQKC2kSqT60aRyJB13xYWsIIgnHKRFWErUgUa5uwcwNQNiqt7O2yNqkZQH6EkCKFuTet1oPjOODIkLHZvQixi8bPsJ2tMurshpeH17f4OI/Cvb9PcX8jCict3mebTc3+NCInm6lMbvkYt+GJmJuyfT+9P71/zX/X98+hg+uG7pw3RvurWoR/IAWwEgDG2SI2o+YT8RM3FQKBxDxd5Gwbm4HCGm1H6XwXGaedV4CxkIFOQITax51JS3ieBSmB3xEV7WAkOqCA4jVg1wRj1SQZxo/D0j2ui+oxtnIRmLqvsMNBxhGZ64GunmKGSxQPTBPpqlTNSog5Kbc7KvadQ0vXGYSmuAmNrHw9Djhe5Vppr+RZvqHSelkJwA52ath/9q/9nb5s//sv76CB9/NWVcdOpCGhWhRA7LCfm8hepgi7ipIAAgvAMSdlgqFm7EZL/q1s0UKVs5U19ygpBSLgnf2ug+pkRcAwotakwV80BHw9Mfz1BVTxX4oLMoiJD3Vq10TsD+H9FoW40Mdiy7eh9HSAphKiTQv3Li9YHYIcee2HwXLIsuxg9g/THRnNz/rP7gpLN/d1CtbplBx1HssAQTwEalXXv/BS7UozCfRNwBZrQJEQgEBfGBfXug9VPCA+gH4QPG5XV/PenEx50ePpvn99+f9w4dlzJl1+Tt9tjXlTLkzxBDggXS6/v4kxd8Kkaj50e+R4V4bEi7FHeBRUhqy131YdWUOMBmU6MDY1R1Am+8dPJ7U9eU8U4uqdDGOdJUzzsnN933f31fo1nayB3/BA/vK5iurO/nOZmWrDRs3FSS8WAGIbIxsraRbYhoWBd/sZUTV26b2VApWKZnnbGJFEje4hOKxauMABx6ital4S1MChvSf0EAcPmwh1Rkf/nU1RmAnYWGCuQISfkjB0p6CNZaxZeM/E0DoCwcQOx5QEbBxaZfTfbq/PU/nA/YjraxYUz5szh0+xsnTruZdpFyhZbBWR9tdFNL3ie37Dh8fjB/c/Mj8I4/r4890ZBhM+dbw1vYsNfhIm7q5+sE1choO9Q9GPvCQjB0AhJgGMloqIKgHiU5YDGCCL+FjCR3ZMtZLNSQi++NRtOUtVAJ8mZgkfptWt6O0vCWEUA8ccbl9KpC0ael12/IW/+zjWFB4DK6J18Nei2NjGRGhemDdoHBXdtgv1+Uaf6Xra7q+MbaRhEZlHZOkqUiZZJD5Qi5alyz6x6jQyU4AcrJXx/6cP+dv4lLK/Wlqcz9a+9151gAQFKY3CIE/3ZHJKBbMFopIpGNFPQjHTZYF4jilGrARrXJFASE5m2E/6jpEwpVdgRA8ro/YovB4fC/6XcBHDPUDHEQevcVjpw4iyjUuFRaykLh1AVOIMF8vFJZmvt9gilngJNIAJOCDcGyZYnXoMMvkqT2OJv3mUTfgsIaXo9+11KuFMR8AxLtduYtfsMMpAOQ4Bas9b0pdBfEJ3wAOBxIBgETB/m3VjzKOpYEHis5rLFX90MeP51zVj1zVj92jRxbdeiI82w4VndUBIAAscQDpsde4tBjfhcdfzT8HkVIYdSBwUVc+EDMz1t2JemROSjSoKlt1AEfJmTRnRCsOIJ52RZdQO4gY3bCu1mu5KoWu55mvTwDygvZPk23/im06y2ebrW7XydLa1DZwwIdRXZutASHV10a2EpbFyCEL9yapHT6wbn9CmWdlK+L/8LRUHgZw9JqCQbA/cKv9qGtf0SABIEJBzJHhh9ALkU1JyNrrWXD1MgXLL2K16KEGpLoW+i4DCDc/ho/Yt8y9Y9JdvrsGoi07Qc06x4BBeMwsUa/38LklcG8dvH/c2ge/v3+/zS35ln7r6hnlJ/RWemtbOz5tzoazBOUDANLgQ/o/dp5+JRzqh2m8hw4fiEKJjFJAiA8eDPiAP7cD1hI+4nxACByPGYqIK1sBZqGCxFuRkGbDQiFbqCJ0bPyMbWlIoFJVwiz0RB3CIqtYKVLDtKVeBYBEZzVPv4ISUq7zNRSQ6cqurqvfADIAIG06uvCYhjQxc554msf1OLVuWK+OnewEICf7w//wv0vv3BnvqFKrA1GN9CuKFKxB1VY58/qQUiVeJBHQsVwbO5RwQET1RcpRAAGZQ4iqSrto9wstm+eAhJ6KVT1a4IoDDkc8SgviJQhgrSrYtwY6yqalz4rwFJvmKVmkX/lr7TBitoQcWryPtr9cW7gqA6oa6KQkxNxdZNmxHTtWHesodmeBB6ksy1oOj00aKsh3K/VqYQAQWa0CPnihClDyIn53fs7jBYCgWB8RLnAbBsFjWV0zfYYBWPd7gvLR6j7gaL375MmcP/54Kt/+9jx+4xvzzTybenc0vsX1E1cTANUwdBWkA1cKEIFFi2YYYCmgZaG8Eftn0ZgbaMCzA0jL+zuoH+J1IExhC8i1Dp88MtONCOZ/wOlmGPh6u+XrGm8AIOOo30ENyMl+2V/0y/iar9dZc1obcFgAHU35mHXeKCn2BzXdwhcXcrr8J6BBR3XlUsCMSrlMPM+FcyHmXvfhyscK3sADRc2IDh+cEAV7wimeyqK/AXc9GQtXXshcATEmXqZgPVsB0TFDAcFRuoVxtZcKIaF6PPt5DOs4jwJxiNQo/RYSyZbxPg4XuPOIC9uymO/R4AMe7YNR81Ento+YW/L90/d/8r69f01hR8Xnb6Q3tneHu6tt2qL2pBeeS6ReLdQPtqi/EC/MScTNASeCaGYJANLmf5TWhhYQgkjYX8LGMXAgHikgsY6L/OZGtvQD1vkWtkzHWg4GQfgs46MNGJE1A0JESKL+pUU17R3JdCbMkllCSN1rtTnX83UDkKt8NT/RJ1c72l2RUBtGKCxzWqUppTRWR8yfDJ+M9NdSPqVhvWJ2ApBTN6xvfWvajiPfUYXygUJ0Q2yKCNzM2rF+QS6mGgqFRdtZmB87ziENELHFf8YCQKjGroB08GCtjrXiGO4bEMKM9VODDt2XtSVhTNgNfnhaaWnFypGKFeqKLFKw4nmk+jO6eXUYWV5HR3pXuBmACjcRWigfCyeGLWZJCNyVA78PBYTEwEIrxXSaKJu9HPiw29/ymQpIXJTDUyLxWN3rRQXxeYWN1jwlQAchVkd9DqJY91YzgeNMz7cGH7sdoGOGA0Ra7UdNvaoAMs/f/OZ489FHul+qWIi3+N1gzslqvU6DKx9D90M6Vq/dWRaiL2eMLBsiiDJLEWmwMRMdUq8cSNQVEfu01DARmjEJfbWi6nyDuF4jMupCrne74fIX/sI3L0+DCF/cHvwTD8prf9FrqP9Yi8qwtS0gBPtQQdrxQmVtZhtACRklF8tMSdVnfyBWL5pbATpEK21JQlqjsUH98gLzxC3CkY5FDiNRCVKjt+EN5dTN+k/uC4ceYyaLmSGwqBHwYXAWReg5FBCfT3JbnGDiTzvAt4WOZ6kekR70vCdD560fnH7w0Zf4S2dalKHfZM2oLwB8qE85VzigA2lX3mp3ruAxfzh9uHuwbwXnlx/ahzt6jmH2B6Z+I/3KJ56Lz7to079j6nekuAEIvEFFg48ahYkDSFr6lRehQ7HhVhOhDiCan4KLyGI2tgCEp3xp3iSAo84kACSAKDq8h/oRYrvVzWd1yFIt89u9AD2aVdQr2TqEmBmHAgJwCnUK0NEUj7Jrfyesr+arXLdymS9zTYqbP9aPL2eed8w8cWJACFKwEKdhGAAgs5qO19vrkf6hE4C8SnYCkFM3LKRhEXO5N47cACTqP+CqWNuqR1qZm6pY5CIfzOIiKYpuYRRQ4sBCsAMUADZwwR7wgUhw8+GH4vfjHkNVgStVD/hw0ImnaFDAobQUry3ptSZkXQXxxxHj5ErLAW764z+tggREWVvCA0I6eDCi1ciIeF/MzbmbRAsbhkVkjoHGgBAHlqgytXj8Pjl9mmyu0b64gYPGz7stM8f0dk9JIoG7+uHdyyIv5Pi5Ldr50jCQiTC83bmDx/LzA0WE+Fldr3Y7KgCOgI/ra8z9QOoV4GPKH3wwTQ8ezNfTZMvZH3aLHCw8O+a3rM7OMGgxeRoWIy7rQTjUrfi7Ld9n9GXttR/JXdTVj7JIw1LvfEXPtj6LZrWysl7TvkLHbrPh3XZL+x75ZhiGq5zp8t69JzfvvPMPKp3she3eX3ovDTSsr/RKzvV8PegA0GhpV4AQxOqr6hura7/Q115yq9WLYh/wUahkVCkgBQuFtJnzTF1LtdTho26BHACO5Aiyin14/JMGp2XBu68MrpF8ukzBoqdqQMxfpWbrAIJc/hdKwWLiHo+O9eN26/s/Azw+DW7iPUvdLsvlXEqxUbvqUR3pPG2wYGutu388XUyt0ByT2vc13Wr37vTu9Y9OP3rxY+XHLq7saqbn2JrW8mZ68wz1Jki7wtA9QMeqb1jHuEeKb/p7oReBSBJo0VWQBh+IRgb1owFIpF6F8uHF5EvYiKGU3cUjnJK5Ksa+xkYwL8zvMMIt8lMpWEbYXxSC4MfBl/9qvRCEsKFTWVNCBjqkx8XgwVA9WsF57hCCdVU+Su1ANn9r/NbucXk8XdLlDUQVFob6MUmSVvMxyDBVABwBIBUIp/fl/fHUjvcVsxOAnOxf/Bf/7vzNbyoK0c9L0ZXPANmoanUoIA1EVtW35sih2ms1OhQsx5zzonVtGI6xZ3B1VwVsiJaCyIr1NCEyYhnHLkP4RSwt4wIyloMIeflsfRhc1IH0Yvc5m0H9QJwzmZqSsImn59dgroKYKx1RD7JM9bLlHI+ADuxbKaGEiEMVGZHLAKGCuBGZr4xDLXCPDk3xnFGsX6oDQDLiF5N6Zfxpj8lMHPUfKdkCoizVmHC+u8kSUOFhgELmDiD97xtzEtieTj9LGqpZzuh2RZjz4cXmuUS8vJzt0aO5db366KNx/omfmK7rBPS92fHU9NsAiFQA4Q0gpDoK7asLYupT61nqmjuELB8/Vp1fmaWpHERSiBqEZABJShKdrzQgJO59ZD53hWS9thkAst0COmTnMHJTX9+Ter51wPr7/r4vXRK9bXSyF7Zf+Zf+Sh513GTLA2ceNrRZs3JXQbTAmyJc4yqXsvFvwjt8NAiB1zOmuMDPmXIuSMGieUa1goq5vCoUSsfAq+ar6o4kKUlMAalLFo4kU8cOPszOxE/TGh0m2A6ZqEYL8AgFxPAa28RzW7TVfVEVhN3D+Bbbs8Ej4OW58BFmbHRDN/nb+u2bj+aPdhfzxfRJLSlHTQfmeTzYPbiqxeU7pFnBf2L+iSfv5TrbpDx4EnM+Ps3ekDe2aDF7JmeYdx7QIXVjrKtRdSammMURF/Y4l2ocuO0x1omI4ICPw+yPUuIiPd5qAw2hDh7CYhLr5cbNjYmNmVskpRaxRQF49YARqtZj4EgPQgfmEzYWfx84+MJqiFmHEAAHGzcFxLusWT0GAGnQUaN516uCVsiXdXs/v7+rytakpkpCe8BHUz6SjIiceMS6+qSDzvfl/vjRP/LR/GpNRT/ZCUBOKoj9WX/W3zLMs95VbQrIqpRDO17UhZgBQKiudThKD1rUfjAiIS6h41AnLnXBkaJUesoVwENqZI9k04Q1NTjxYYCynMYe6kG8jgOE8PJ8dL5qnotRyUx5tupk8wSAMlo0j/F6DOPo8BXtfyMVK2x5DdsPB3gEfBCizbP/t4ACPiR+N8vGiKEShCcilsPgOarR8Jiac/NWjPwFqB+3sOiGRT5AscPcQbWigLnmoXwczGL2C3ZK8FYktXepKdLmFKpVhQ7DrI8ai0H5uLkpUfOBoYP25AmKzqf88OE019TCfVU/rvwxb5uzHtAFGBrWa1nBNxv4UE3gUj15CloAJLliVy0UMtZeH8WFSODZLM2ugsCVeQj1w5jlub/j9RpKk0mNc/UdAAQqSAUiKCHXd+7Idd2/KmV18b/+r2sACJ3sxe3Bn/bAvufO96zO5rP1tV6nrW1XYrKy1oyjQAVZq+oKnjVDDRElVz4UsV3ie8wFAIKIHk0zzwW3NVJjAAh16PARhHIAEiHhxvAkFCNNYYtZ62SBF+1Eodz43Kjvtx+KfeNQQKIGpG7qBeh4jfZClR3PAAn4rY27Pw88sD33cRfKzkRTubCLsabv7D/Sj3bvlnevPtQPbwAn2H9oD3eADgALIIsXYP+82o96gbsGfGykz/yoEJKG5EpU5JUyx2/e6wilKR/CAvgYvGu3EHf4MLPkgwR7Hq1ZRCdJJoFz8v/YiKUOGio9hivbITp0YK1GVvyDgKBmBielvvbv00IZ6W4kscbG5CBitIRClhBOnmMO4Hat1xnQ4R3KCOtJp3CC+gEAqbEAQqpGlR+WhyM0IaomLKNIdcQkLf1qJatxlVb7YTVgPX+8/nj3yf1PACBGr46d7AQgJ/tT/9S/c05puleKee1HwEdzFKOvQgUJUZw5CrDFDvNAJJSB5kQtcgwDVBUrBUpHMsAHPGcxOCAkfBxFVRcg4ELxEkSOv81++hxHmpdWp1bkXhp4YE3T3DtuNanBVRURRXQ3DrDCeqGC+A0CQMLFlRZxp+oMV24mcT9e1sMwLNR3jpqBFrXDR6SMtZlbzaGCfAHqx61AhZmop10Z3BWdvh81PGbGR3U0USJLgCsUhyOaNQip6+69I5o18IBPk1J1G0e1Q8H5HPCBlrsNPuDvvTfVwvPpugJLWYLiszNF+Bk7LRVs2G55s92mNVKwMPMEEfDhaVgM77boTtQiq0MwwEOrFzPBesaxpztiiQFE4oNxBB9Iu1pBYUqprSev+YADPm62WwKAXJ2d8fU8y+N33llfnwDkO7R/nuzX/hW/Nu3LfmNqw053MugwsHGrAdGiKFJfFS1DdayTWtuQD6+e4mTFVDH3OXykCUXf2bqiasxsXoqeauSY8t0zGNtKqscUdCFifjrtSqMGoSsdrAblxdiiO5YFg/jtAkDgABAoILdsw3uLgnSG3w48juHj2QrJ7RQZ8+2z7NMABFoTaj+a8sHrtMEmvfVuqlvUgEjdovYDG+Cj+uAQghjj8eGJifscEFXS0nNoC9YdFZsxcRHyLyoMkbobASwQCxv3SKwOHQUxjldvsZX69EdWB5G25yqX0sIWxerCh0TqJaAEFCe4t0A2VOStaBX7fq9Dd6wAkWwZ4AHgUNR5PM6PUaFTUHr+KD+aH+vj8cZusj+GMTNUj70k6RH1H2nYt0L0IY2ykomFd9969C204zV6dexkJwA52b/6r36vvv/+hBa8d0rhVVdBov6jT0U30wHKiBml465TqpEXZXS4Vj8oHl4bgegtd5MGgCxSsEp1HccOIX7fRW59i7AFaCxr0DkKeJdpXu5EeW7tWm2ucZ4MEXeLb+w5AEfYSGTZIcREpPfCXcrUIhwAEu/PeuoV4mEd32wv1I/m/lPiBB5+MSuFVZ8uQMcaMOKF6PaTV3hufIvHsQCyJXx4DIgL8OCF4lEt3pd5ojzleTaHLBw/gMc8A7gUigfAAxPOFfAB6HD4QLcr1HyUnno15W9/exq/+c159/ixTWZ29L7ttm1FkV61Pjsb1l39SICPFcCjxuj65dPtnx7M6apXv0okUQAHXDVlVc69IB2eEK2nYfWp58+Cu57eZog6DLQbhgYfVfGg6wog+/Nzur5/XyqE8OU00aP/9r/dXtN3bCf7tX/tr7UrvUIh+mave8klJynSVA9XQIYam886rwt54pXlBhu+bpPG5zLhWFNAphrN1MhryPq4wUFq7AXnJIEhIn3ueUTG2jylBps3Cmfr6ktde5vdQ/Nng3mB/FNteAOSZps1AOZF+1sx7Fkn+djjtkeMwYstjMNfYqPfWwDIHb6zuit3V1A8kGrVYt0CA+EwcsPvO9KusNW4QmRhrJMXpAsZAU5Z4x+60gFQ6wLHrP0w9T9oMfysznXdonUYAVgwsfltcaz437b4MXjAijm4LEEE1uKy/M13LTpYUTdPFpY02JDE24CgWXQAiQ8glFCDlm1ZUN1SwaJc6dWMIvWLcjF/a/7WTVU79nU/V0Apj0uHDyhwi88TFJA9PAm6X3WHKrJarfbeHWv/Y/xj+xOA/PS1gV5JOxkz2//z/1w+wTeq+z3fWa95P02CFp93UuJdSnRW41j3x3m2aMlrkbJSCnLyiTp0wFLqX2UnK8VawW7O1PLYHR4sFIJSACJUAB29CN0iBac99jRJOagbFBaqSlItnv6k4kXnkhL2o7DdHAqaVs1qXJ2qG2kGXZBF3YEwXKyGEq/T4UdSikGFOAEvoe4IEKzXe5i7MF5DvIfFfwIbW8RtVa3UdSgtjHWNiZkRq5P4UD8JdQEpT8d1IC8ZPuyzO23hBqFgUO4Twq14uYvAiZhVOQBV+rkY1RwpclaivmUciebZXOEwunNH6exMMRvENpsB9SZuZKpNyUI6FiAEXus/Sv7oo2lCy93Hj3WK3zuRvWDb4qhvkWrsbb04zAdG9tkliKodPkpLsCGXz8x6PYtpSmwpkYmYgwd5nQt5/UuAkRe1unlaW/VQzdqjl7rIzFSGoSkiaGVs6CS23Rq9/vq60Mk+l/0HX/sP8h/6w39o3sluWq/W65tys5vn+UkdiHe2pvU5EW2hiBgZakXOyWjrKU/km0WdxUyzj2Gb2vxr4l6lkTjTZDify4qLZs46yEqz1khJi7TKADNW6rNh6NClG0tik+aSWgTUGicikw4gpmbEAJNl8tbS4jsdnPxMJLfnXdXzy5kXwrc59vJtQ5tUAWRo9Tc0dPhjYVqY+mSXzG0Qj7e+Y86ahbXPyoXDcK4nXbIU8IAaaS5NAYFb6VRgdd0e2FiJTP2JQvimoAbcxFc4h82s9L9lnK5OcFaGm5gcIh6fqSlkNSr5iHbgUcCemDRu6eWIYr2gJUVVCXuhEaf+XzQcUz9n8XmHL35fmLIPz7SwqnqUgB7FQ3Qzr1UBrEVqWLQMTsJdXGdmmXjiv239t/Hbr6C6e7KTAnLKPvjn/57xz//z/5bzee7F6KpdBakx5oOsiSyhRS+i88dCCWHvjnWsgHCAhoVD+XAvOUP1SNWlQow0EFk8LoxV2ZifnmB9VNjuNRPiz5egqniNCducu/KBNeI8GwFKjEycvxbpXViJsTDFWwvowPKgxjQj1VB2ONLJtDtbKDmwxeTzWPOyfsbfyKL9L8EtlJCegsXqikF5UfXjJcKH3ygghFTEYkhkUBasrSLG+/CalmgT5BEAYmW3a0AD1SNPk5VxVLjC+5RzrY6Yy5MnudRBg/A67TznOu18fPfdfHNxofMS0F5cAWFCrcd22+o+1mjDe+iC1Vyqc3TBYl60xmxT/fH+mlN1n/bP+JyXUiRSstTTsBCXZL1QPyxV945iyilRHgbeQ/lA/Qdmf1S/OT/nq+qXd+4MFznzx//Rf/R3j/Sd28neJvqZf93PJJtto6TDZFPKJQ+T9khGqP9I1YfZ5mEu87qNy6P2s6U11eNQQNoEhJ3tpp3dzJl6ej6RtZWQRC+sJL3kHC6px+TpV1hHIwyOIW+hgxTz6gJTm/Hs1RVI7NThNQcadSC4fXTCwmvMIaZ+ofbFwwcT8zOONfVjI5uWeoVy8xoFMWHjvlV7arK8srYaDyNLNQ4tEuGGSVgSk09CV+OSe95sLtl8rQpXi01xLOe5zCVrnmed8oytqWe51NjPlWo516imWVVLuKnhM4djcKwjFgX6NMO6l9Q53XR1JT4kMKNWc7S29TBQT71CFHIIoPhlHLpnqStu8FvVAzFF3VKAMXvb4UlErln4pvoIFUSS7FEDshpWu+pIxdo92j4av+8f+L5Cr56d7KSAnGy9lkvMGRDh85RkPwxyg0LXeS51zXtVHLO6n1fUTKmbWNtTI6RS9Qtyq47Y0ki4uqZ0qBOPuhDvhOWF6KxmFvBh5KYKeBA8WTbj1MGmWI8EqGkqSylUYx8OZxb1Jmy514FEK17KxYtXqB3jOXsNCbER9zfFLD7fNZQdz4ey4iBizKymerjQ7LbM4WeKQv2FcS9OplBCiioey3DL0i9IbVHITXTolKVe9E1cCulLLjw3s9vUhhwgg0jb+xtHy6GGRc1HXyPJvcFZ6ipCtC7j6CDmF+sAUWt+dRXf6hfFZPTz88TbLS78D8XeU0uhA4xovb1WCMnTo0c6YSJ6V8/6a/kUxYOfd46ZvCVZaspTKB7cLci3OrOqxecCbvgf9uMzcQC1RMyHuhCRGDjD1n35FTV7Wht56hUciozBFYMa/f9LJkJZhPNqRUXVKrSVTCf73PbO/M70+/PvPyZKZxBS96nir5SbiafLiaazenwrJtumgmiGIrJezt4onasV6selXk6Z5uJJqybGsAYPyZKsh3UZbJWglgwsZaYkwqmISowEQijRyYOJ+jQhcyVW++wJqR5DZ1yLw5piPsRxBypEVbUXggT7SYSOOP4F2RmfDQO3FDiGCckxqAS0YRHtclnqpllZTaNwW4QFjyPFSteqPbdJi3cg6/DhsNEQsGSstcMFVkBDNfW8qRIKiFkkS4UdqoFgpEvpTf2WSjGQ0hUGitoTKkzGfeuqiYCmEmHkIkAMNR6DDVwd76mLZNyexBr0cP8OCQ8J1ahwmaIYnZkXU7KeK5otoQcbNQnPlGNgJqKZLWtVCM0BsHpF7WQnADnZb/gN5w//h//h8Zc2m+FOzvNummSXs+xSkt0w6L4U2qdENfK5qg2ugjiISMCCQdlw+LCcOxTEhRRzczMT7qoJIIGsXzzacwaxsfX6B4kaE8Teeb8gF1/TMIjhAq1Pp+6FxEUBJzVmolA+vLiZ4ipYyTjnRe+u6M3LuImwmVr1FBfMNYp7eyP+Db51wAnFIoYUPg8+oo9mr4NnVoBHFPf7BXCsKQFSej0ACwAEsRTTl5h6dRs6sbhd/JfODA4YsOzQyPG+vXbFUiJNKQCKQ2Fq9wOo9s5hWnpnNKoO9YNyzmXG37JCiKzX7X1LdJpC/U6fA2IZXkp8ED/35Y8hdPCQVL29aFrkjXW4IGIunoKoDralunEpHUqrOYj1gN0+6VLgWDePX22oIDgkspzUj9fS4MM6mCESYnX8bq0wy1x9rMX3JwB5GfZzqZz9xNn+4/LxZMnWNtiEAeLTMN3sy/5yoGGTKK2SpfVs89bU7qupASJwAUdE1ob9UXWbspJafLrgQsTZxK70etzQZtVqDijxJClLz2gsTQFxZjcTsr5VI4mit+UY2LY2AnywGbGnY4kn6fBxW4lee5I4CtG/MBDh7yp4ROoVRj9Gs2MOuECEBXiwsuGQknofeGIujIvztos1HkO5AD4kW260qMRMagCQhqLZVZCcs9bYlQ1tP/NUJhxtEKK2EEcWpRsx5yXA46gLVaQ+YeHl7Nxux4fmlFaoJSB31jIiMQn44HVarza2SWtt/b9S63uhUf/CUSuC+2soK5kzIASKiUw2TRC1/bXpIsUvNPPFBM14OIqXW+oawE0BIf5boKVd2qXds3v0CtvJTgBysvPzzcVuN742DDKt17rPuU9b7iBiZx1EZGdW7nrK0DMSggNEGCBSI3G/EI18dm5uRk+lMGH/oH7EmmPNqtwes1/kql/AKuWsgI8l5LQfqjH0kHjOUGeI2gyQ0h4yGRlzT0ptKglnz8fqr88ZRbk/F56jiGry1rjCRGK9rbBEKpHPqzDy+ocjY3s6FUvUQgrC21NhEYBYYZhIrxXwb8MTYkq9DgQX6y8nf8II9qKpVzgWUKKqUEFmB7BVhw9KTctPqFfgxBxD+8T/G8Xx9/N5MJR7+hXl+lgTgISqVYWDlvbMqWXxmfncxtTrd1J1H3tpxKoNLLiziHGvOYrCejggRB1AiHPWGtmn8PvpYjWyHvFOpOBZKH9wLz7vLyOZAD6GgRw+mAAeHUAYYDoTyUikE9GXlF6Kney/3PyX+9+0+00jrlerz5RoYuGxSNnd8M01MW2MbVXjSk1l0okBIELCUDbiorBQseMaDG0fIrMrupoHGvaAFmnCppREKQv7YCBlGIkrzIdeVsqO/+THsd/gQ70LQmT541jcLsy/7X/5CkbYbcd9fgEmJLzcR+G/F1VznKuxARnWi+nxXA0L8nRckAZLNVVNWnRoD8eUNFtSK6KWONdNXHTSUshVjz6FPs8a4DGXKU91NWaUVc4ZR4v2lDpE10v00O9M2xq2/N3JokIN+ybGSgEuis8kOrCZirabxzwQU5OVrYatbFdb3g5rWjcFBClYOA44JSNuDyJYWqgypXBRUcmZczYyQBjOFp/2X4jJFpBBWEexexwPKKkWaM2m1hsm1A2ni9aoFIb1q2wnOwHIyR482D780pemN+d5OF+t7GYYyvUwSFuXomelyFlKtlPlM1WT5YVfLEMRMYsLMOYaXfogOu5oZcZ22/8qqRJBYVFlXJC1i9dhEL9AJOnfGlMzT5PhokaAoMlVEDPyAUwaOrU0JWZmYuq7DiBsxuodrrR6GgaD+sAxtVxVTLWDVrT8jTa8Zp9VzsnGbNpVEGpF3KpWI8xYhGP4on8T3kFktaJhv6f5swDE7PPWfYSp3wgh4EOx6ylIONmAcO5wxqthwEUy6zAYYCl7QbV/P8iR1lZNrM85sYL0vf5fYy6fDkNLEHl5ySHs2Jd6FaarHco5C7lxwGWNHH39e1F8KCH4rOF+XGPUApnl3JUxkf4e4MxMPVIzRB/s6F22rK1rnFcrAAhXADHdbhnrnBLPRLQfR93f3Aw3b79NhV6OneyrNMsPyDinedKVTpRpNLapSBlJaMyU90q6U9bL2eY7db2O6Rz1XKHPMOubXZbL/bmcrzAXJHUImRftapnEAaS3POJCmQE8Uc/R9La4qEOAk3Hbj5qyUEOISjy21A3Ph0vkL6S2g+kLt4DAAA1AByaew8UTOquTUFubA5v5YD1AQx8OqE0QxX0GNh5agbTWyJysWHL4A5i4YCBNAcmtIqM1aIbqoXNPuoI2BvAAhGCa+3yTd+NYV5POGbeYbAaqlFHH1i1KqVi2XrvTlA3mSMSyRG1ae9NqB+5r4r6ZGGWatbAy3kscr4Z6l1WDD9sK1A8ocWtaDStap1aQTylVp2qDwVwBUdKETx7Oi4nPO/FqDmsuxv0/DhwpzfFiyeABHFjzMi1L65a0lZd6fVOrp7KBBlqXtdKrbSc7AcjJ/tg/lvNv+237i5z39+eZ95tN2uesN9WRjrUvxarrWIrsIQosLwZ9HWbYPQiugriADgqL1aeqH8eP3xUT5v7tuQkgJCWz6svCYDwP58Kcs1ZvACMWnGEkPkaWrboaLhijr2q0U4127sbeIlbwHCIMozjv8z+0d/OC9+F6R6lXYW3lqWh6mDfCyixY55Rk6JPCmWLIX58yzu0C2WHlc9d93C71Ktbqd2nRHD4cUPoRwAZO5MxDzuYta0lSUmGW+FvaYcp7U0DgriCxvmB5KVc7fq2+H/5siIkYxecOH0NdJzMa4Ph7O6gtUswAGA2fOBS4UjqsAHShhKhKg455xnsj+DItLx5LmeMYReqV9L9xwIdJVz9I4cMQaVc2E/FIJBOzTN/85lDXbPTS7GSbzQYdsLYllU0e8sSZ95QIKsheRXequq3xzJJdWbbXiUheZNQONdE1NwhZcUt7EWnMIZkLc9wOBcEOGlwjZ6unrXBxPQSGtZHhSGjSQBcTfHx4xcpK1dtFajU8hjbOti+qwPy7bwPhN7GSKO5P2Dhhn4y6csDGHCCJdyAsSUhW1Yf2u8RMUE7YT6Qkxl6/oMZFineW6l3RWgE6XDOiRsrVmPd1G+dd3k1X8+Xucb64uaiOWRqz1bM0tUROer4xL3uZKVNikRUPokY8NFhiVq/S4yamFWtvm4lReH/OZ6sz3vIZ4+dWXP1IKxpELKEOpEPa4WNI6hP/4ZlyYuLUaYuFjXONc+EOxco1wNgQo1gdFjFUOPU3IqycHKS135UtBizubKe/Nv9apVfbTnYCkJNdXGwebzbTG+PIZ9OUdqtVQTH6zTxbhRDb95oQ26pydRs+S4d3cTguwnl5/PNO9c6ZVZWtKyyAgyUEaSOIoiqqjHUiP23mCkikyhpx/ydWulozEU5YpFyrGntNg3idiYOUmHcA8+5bXKo3ZYbCngMfiCLk/RcFx4uqkVTDMRGTDlUx8I/bBWldNxWkFNLvOA3r1ndbpl4ti8zhv2/xOtbz3BSNKWdKUccQ6hQzucVUYFZPU1IivlVORwCpx2gHfQwf8TPOP888+dsrVZgBHsmMRZW4FJwzLwfubxYwy9zSsujgBvAwT8NqKgmUD1WzABCRDsRLBWT5nvB3rR7wEZ8z8vTFDB8GONc1is9truuZWSei/Y5O9rKL0edfJb9qUtNJk06SZMqSASHNLdtITHsRuVZSpKSuXyAZkOP/XU/0ybQu6/bn77KqN7IuvUwuc1Yf/iZm1gAkJmz7RPPikz5MiWygxGd8PmxovVrXnyta2WDJOInO2pJ/9Jqv5yu+mupguP1H9tEOBfP6Cua4CAlH3UekXmHDcS8eZ6beTkRIxDs6CRtLYmSRdk80rDp8DCv8neoxSfDiowiVme2guvj8Dy3a6z4afNQNKVdjngAf83W+3j+eLq4/yB88ubTLCc99u3ZefMA7YYoZMspEDS65qHEvEsQZNc3CVCMp7nXX7g4VPWRLdeMNxzbI0GfTsM/8IOmDCoWsAQh15Q0KHx4uZvbidvHPF2qfCvcmDDVqdNwKFSTgYpGfldlIvGoJ5yINy7Bp3UYdlRLp29dvG73adrITgJzsD/wD+fp//9+fXAzD6l4FkQodaT8MCui4qfEOakBKMaRijVGMHldyYRwVcItUHz+DGPtHysbt1I+wuE0UfTNzKWV5e6yVjKKoY2nGzRkxJnSLUIcQycxGgBtveKJKlFIHAu/GxCK430F5LiVSbthu8TWgvz6pUa2rHybV8FylBojc7eK2X70rQ3mJYvTVypCGNX2HqVceb1P7EetmjJXvRiesZzx4wCGVKKzuUaNfPvX0N0QY+3mL/VsklDvVVutre97rZl8dd8BiGJGlXmjOiZlSjSszTlA+co5pxsQ91aqpUdWVzAI8DLHBaV8bzzP7ADJu5+tamCX112uhd1Tv/LsYx9PHDCREEle+VHplcgF8IPUKcb3mtj47Q81MGonuK71cO9kvopJ/KO/H/bjdpm3OQx6RitXgQ6xHsz0JtUFqqro6KtVmuqVd2MW40tUgvawOblgWKZostYtjb8NLZiqlerYZIFKAHnAhpnt8N92Te+kMF5iypTVveM0rSjbgEXtlQco6DVO5yTf5y/Ll86+Ur0wflY9u3rV3rzBAkV4x85SiKDpn6vAvQm3DLqx/DUG99GrFw6oDyzBgnTqEBIw0MXrgfrGebOAaifscrK5+aPxltJed57nkDiMKFaT6jLjT3TTSrrwIfDiM4h0x1iLEMLxu49D9hSWqPpxlifvv4nV+fXteAXXL27SRrXT8WOOc4X3EYEw4Ht+VHuBuTGxP/umORgjC3i9DTNrwzZnmPrGdWZVUcV9S/LBmUQfCHNX17koGZ2U8n84023ndLvVSaUUnOwHIyX46mBlXFYTemGeu9R9cVZBUVRCr4CE3Ods2JR1TAojo1oyH4//gBmg8DRY9HPNHrG9vx7ATrznWh33z/R6wh4NxtJMDM7H1E9iM+zeNqgVL9hQspt7+lKI+A2YxFFE1VJC21uWzPkv9CPiAITbuUClEFm2EvQuSVAeMMHkReqrrtGr/haQ0TZZfPnw8G0JCDVmmYpl9qqwSgLgADDZVY0QR8/ypiM8y+5QidIa/iNwTE+7FDADJ0sGDE1FMMm45z0mVhnkmKYV5GAAgOGZ98hgr9g8A4gXovf6jgQerxvwaWP9b9ssBiTph+PIzEj2P5KAa4bkV6VdN7ejQgTWX9ZqmszOpaymXl3z99tuc6aXbyb5v9X3jL9NfNlUKmVR0XX1k5pGkQ4iIjGr1WOIbMjqvPpCPDLrtP2xGZqgQeEyPd3Fx6dVVhLSYxKn4t/MccquScqYsE02KrEdcPN5L9wbgx3mqVSVcPZ3xmtdt5jrjbrCiuAg21CHU26wqqOTzfD7ckTvD2Xy2+jH6sUdIBXpV1I9EqTnWy7mLqW+ipMTGlroagqGE65XFHAwoHquAjuoJ65TgOEdDKCHMygEfwMHYAjqwtX14oAnUAihPE+Vyi0zT5RLvKv5laT8SCzfFgcziuHJXEoipuZLaW/LWvbvpznqDBtCywftNbf4JrbjXkHSYEpboTR9l8AxYiygmUh1UIckSmSvaiZS9HkTab4OtIDrlDUzcb2pK7HOM29vSPhSRrd2inRMVGmzQLLmQte50Rq++newEICf7rb/17tX/9X9dPZ6m1V1V2+ZsqAG5gQ+DnkMFUaVtdbTxSE8rFYK1BYS4Yx12lIoV55cXosfqx+fOQuaI2GKfASWGI4hSl+aJwArMULV2UHuql7Si+q5+MC9AKOZa2PJ9Phs+4rwc3YapA03vjMUcANJ9GIx8onxKSVkEKogO6BpFS3s58BFlrQFpsW4/4vwtASZsCYiRFsXxWTicX7LC8f3CuO1ztefPbbaj9xg3b/AjLsQMNQ4ijJikGgAkpb7v/+ZJKZbMSFQN8LFovasAjhqteSndo11NNESAhwgH77UwSQG2i3olW76v/hkz8rSrMgyADi4o7N9sOMPXa9QKld177w3XdLKfrJa8efqhacySp03azDwwJsSNNNA+lbTXonti2onIjbJCEbmz/Lfmtp2ijMxu9GYWkp3Dh2ErUgwtY4WkOJhwdVFVKZ6Khe+w7ybgxz25m4ASd1LdZCPb1qFI6uZDtQEg1sfcTVBJdCObhG/CV7yCyzqv5Xfl3/Xhq5COFfDhxf28/NfDFSWL97nmNQMo2m05pQ4eKwjNwyANPuDp4IMkw+MmImPvymimMGuTPbzpbi8sL9ZhZNYZsdQI9WOE8mXVPgs+EKKtAF4jDgiL/+ht1RCTDxxqyVLk7dIdPgCcVR0728h2teYKH7JqAAIVpzrXdag6zD7oygvs4yUqa+RTc4MQJVE2jcb1iBJ6hqsoKY6xxX9yY90UkilqP0gDGgdibY+v1W3IM23ONkonOwHIyX56GDPb//a/PXm0XvPr84wuWKgF0RsfTnhTip37XJC61o0ZBFK2Z4sUbL52Mwo4iQOfU/04BpYwE6IYz87LJ4sV3DgYwHomqqkQBwj4OHdP9YrUH1Xhascv65apV8LPugzpHR57Ym1dMpEgJhG2nprTVBjENAzqBd4mMZTQjF6yWcQAjk+DF7tFKpjPEBEONSTe/qc9P/Oy9iPWzM97arPmsY6bi6tvAuBoVxAiQ18L4KNdWZi128EHVeybVPdidHjhuuYOHvAGHMuZwPBFcTwW0tbudgCRpz4T1S3ux76mYYiUK4ICgm5Yc++KxVNKvFfla6LdSD9pdrIfmX5k/wvSLzjP6KMqOumgoxSZUIwOBcTURhPDeqemZ2aWAoUj3rJAu0GIkfUeV1LWG9uUzLldJNKh9QNTq1NSQMbqjfRGem31mtyt+gcc2zZtgBM88NBnPpi3Ui1mueS0z3vdy17XskZtBEddBFX7meVn3v+mffPJ/58hBNA20PA0fDjiS92iVoPimIk0cZs4DZYGeGKHDQOQDAEggijtuDAZxdwKhXsT3ZJLdWuNd7FWxJhrPumU92U/PSwPrycby2enXFFbiqdcNQjhLpEqlQYYhfsx3Ny4GPnsmULa3uSG1+lL8uZ5hc7VGnDFw7CiVXs/A8MH721y2KqZkublDI9YVYvOVeoDL2M0ZgBeU+mIXRLp3AGTuhA2xl6JLDj/jEaKV4MfYWkpWDc856v5qsSzn+wEICf7aaGC3Lv63//368uch7vTpNv1GoXo6IQ17DAfpBTaqNJZjWMpNthBwAjjJZQ8u9sVQt9d3NeOwCLsljMf8KAmoXWID/kj5lA52p5ZtAWO4V3JmANCTJhV6lKtRibR26eOPT/16hg+jqCJq6mIsKrVQG3dW/+qpRRD8jQhohC9nksAkJebevV8MwsS0efDx62/842/+RJ0ONSxhfrxLDWMaWkBSTDfhzHMVY8kQoC2VUrSqklrrPsdPjqgtNqPSLcCcMQ+yBDOcE+7MtXoihXOiEdqx/L3w+rH7LPVJ0SbmGkSoTElHkUYcapxHgbaE9HN9TU9efvttzK9OhaUzw+J0qZ6qj79+l+f9OJilfb7obz5Zlp97WuJv/71gb/85TVxh0ZGhOXMNAwWxOuPqWm1ylSjUa+dSkRzDcWqb4gAcZnffhvxafsVNM2/d96dpbNNTnnNiRt8pCGNRctISntWHiXJjRW7Z2RyyPp8oTkZrKQNQmaZtW7ljM8qd66HGByYrRekVy93+c72jeENeXP1ptxf3U/we6u76SydS1VrZOC2NSWAjXw2heqc57SVre55r0i/8cLjaP1rP3/181//1vSty895wRfv8Qu1SLWK4vKFFsp+3phYvMtUg5EVrQa4pxVFi94kVp0ESkeoBFhHPw1Wa6io2i/ES2nwAe/TP7IWVzumDPhozXfLOFX4mJ+UJ/srupqMyJ6nesRezCdq6MFkQA+sPL2K4FxNWckYx8QKmeF8fIGz5bMBnyUoHlB6VjwkYWzVPOGqqxSNA2IauSqrYXOjtrnFZJKC8weFnIW6gFvdotMVYDbA2QdkBohwdWVqbvBW82SCfVrxqqgg14KM+AQgJwA52U8rFeSHfsg+nKar18ZRznNOu/Var+eZzroKQtvq+2HgG1XdENnqSKWItBKOy97PvoI3+4wJVvZp6sfRRZ/nyBZuC5LEIImW4y9sZj55Nf7RN4lLSSMVI2HyacLGJtzyVXkxG0OM+QAXz4ePpT1fsWEv6VNFFO31IGQiZikJrqncWbxLUlqveYU6kE/vhmWf8zLCYgkPDgmzz9EGmBwSEAPO4Av44GeAHfNz6lSWICMuOgAwWloVfLVq0LGqnlKCkzCLeN0H7iO9k1WDvhYBJHX9/7H3l2GyJcmdN2hm7gcCEi4WV1c1t9QtbLE0PMu8q/fT0veXlplaywzzwvLXBS0zvLPS8GjEUjNUF9+6mBRwwN1s3RyePB1P3rq3urparVFYPP8y9xMRJyIy82adXxrRZbQjo/MVLX4R5Yq6mOnXjMv7lfeDD2bx1ip0SIcxxQfXxkCftQ77jQhuXnutufjz2H5X/ov/RXvxV/5KVb3+erP57d+24//n/1PBnTvgAZq3Dw5a37Y11rXdGFOLtZWcn1tArOHaNWuOjqqqaVrabivzzjs293dGYbaRAqeme0RGIp+/+Lp2EFQ8VtXYAQxU1/3Ff+Q/0lNVdcI80Hy+MqtVx59f9l9Z/bb97eYR/DYBv0MwnhgYnHe9QRM7YjGzQohGQTrx0gjIk3spPC5yGG4DD+4UT32PvVMAaaCxBITnfN7XVJsbeGN5WB2ZG/V1OqqP6cge0mF9SItqQa2ZUWM0slGnfP40zQJEYvSDnHHSUx/xJIOHSu9HL14UfX7S/uTtP3B/cBf+HNkEPkj97heVIFXulShS2IMFE9PPCLBcFANwfgZFj5iD48iIpXJQISOCBwefI1a69nok+NR4N0Y+3MCDgscYNGz9drjg8+09vre6qtUuIuC00BwRweQKMiKje1N66cXHE5am3uBz1EMgdqpiQsJSSzQDTbvSeiIqofsSq4X4GBEmEWRkQS5zP4Lny3RABq/bMn+mHJVgutbXjzcv6V6PnnUvqgQvJJBr4QRMBI5clqkrhUMDRsINLFhdsaD4U3/qfn/4fQ97+wttBHv7C2ef/jSu6xrPmsZuq4q6ujYbjYRYG7W11myNoV4FQHApxOxVApdZ+1fUeMikVW85XtZPTr16nCFRLtwmtETBI5CuLWJVEQWv96nlUmhBFUQBggilPRMC5OO7Rc1Tj4+FjquiHzvwMc1QZiLk7INIjFEhqPT95ynjpMXoYW2eDB8ftPB897GCT0s2Ij+YqeyI+JhaINyFt4KN6jGIEEEBo6pr07StaWYz087ntpnPTTubUR1Uta3er8KoqlIlULE2qiJKdSDMqbA8Xd9eCjF6UV+qgtJ++r7UQCbwoYaP+7rl+YZjWG0VMhBxDYBbFREE6VpTH+Hsq1/t+x950Pit35p3/+//942z/9v/7ROn/8//5+fv/2//t3/pwWc/+zc3b775r7v33nt//f4w/Or92ezn353Nfuk9a3/xHvPPP3TuFx+O4y89HIZfPNlufyHoV0NB2i+vRX618/5X+4uLX3YPH/7i8ODBLw737/9if+/er4T1L+T9L6n6+/d/Oe7v3fvF/u7dX9bH5OO/Mty9+yvh2K8N7733K9077/zKcOfOr/VvvfWr3dtv/6Xt66//5e7OnV/dvvnmX1qfnf3l7vfu/urH/h+f+eK//Xd+6nP/2W9++uP/+fvPP/sf2dw4/ne6ZfMFrOA6kreIAxAojFwg4oiAT5t2hVlXRhs1GqJzQk74ZBvgo9vIZjjxJxtE9NftdQwQEgDkyBy318xhc2SW9QEdNAe0qJa0aBa6NnFfL2hezcP9S/URVMLaLqulHjNzm24LvZlFfdvenn+MPnb45w4+xCAJXSJ+CXfnW7lw5mR5Fu0khdILpGIOgKDgRVEDWNHCJ7QYXZznEdQPI4/j6Ieg4HnMkY4heIWOblRpulUftPGbfsUX2wfu4VqLz3ejHmolWJ67XOW/m6Gu4weUUjmHGT7SMfDInDtVMQNLBhgJggUudOaHJShpdijFcsNg9lGuFM6nTlb6GTko+XH0LkZwxrB2PGr0bwjqp3IcHiLx+Bi/XmqKK5dC9kzCghE6hDgKiBU+LFjORfNOUBSXOR6rYQ8g+wjI3v4i2nwOj4YBj3QuyDjGblgBQuzae6fpV/OgLbO03stMBM2VkJGcfPjhFMUeH/0oxwgxT3eAIAwLgwApW5alxNGDUDCl2pTiFD1N6qqeIyEswgRgmMOKdjhCT7BbC/JBU6+C5HthhBhRKEEIY/ocJBoBMYaDgBKEiK9rsGkA4IeGjythYtq+VuSjnVb2hMJzDLabpiSTie7qkQhNkFWgsJbU25Supj6NNFYZk35EEJGYU+RDj6dsHsbg9Tg450s0Jl+olPet6+hRBMq67KfRogmEqPG06FxtOlNFcqODDgA3AJDhA3pE2IiARkLWiHjx4IGc/+ZvXh/gR8hW/9v/7VL6fslNM3Pb7e0AFwv+9rcPZRwPmflAvD/0wzD3fd8Mq1Xd3b2L2zt39BKOffoBnyFAhYgzZK4FsSUiCyKNDb71nmi7BcuMbC1g+odCIrL7C4bKAifxp9xyjXWdvUdEB0HRE42A2KMxWzCm1+JysdTJPeqat0CuH4o0h3O5sazl5cUcf7LuqnerbfWu3VZ3cGzekVHuovQbkaq8/G7Mt9Qf6DECurJgHSfbPBPBDTBAsRfrF2fHzbE5ao5IdRjAY14taGZnMf2qNS1W4WbJIgoSCEgejqcF19zHjD7yIGBYGHzlxYmj0Y+mt73RWREvmBcO3uA3zv9cwIdg9Ltx0DwoD1W64VSxUcoQIawtgxfBPEkFPTOa/Kd/Fqbo2SOj4OU/aL1xMCnRjxT5YMfee1Dv9KK9aNz6bb/yq/4RP9qcyun2qqhHtLwwGS4wd8eIYQkkZGDW47neAwT1PYuUn5N8BhGQaRtioijEaZJj+Rqx3vAylSof8y5/rhLr8FJaPntJR/I94IMkKN7EiQOvwlgKjwyMHqKX3LIXghlGRoWMsHYE5AFBwZ0NmvhvEQlHxZW+7kd4Hhj2tgeQvf3Fs5/6qeXZ7/xO96jvZcHstSPWZhxhXlW0DT4OJfSeOs1Ldw7mALIzm+GxXa2evP7ghef54QSxWbuJhdxlWlTYpBBNSr8iQm8Q8+DzlG6T33xuxYulQxYkqQX/2C5NO/CRjZ6UenUFwBAgCqfhdVSGEqLCh7UECUS81jQEiYIIOYf8eJD4CCjhQ78OTnwRXFl4nm2KJcXyPA0xGEx9TrWqMnhUdQ26zxWlSPo1UwIJa6NOBJETiFL+VpBIgg1EUcM8/XxSAwNX+gwWQWkIIWI5dtm6GFEwK0cHLwGFGeMAZf23JALboA1i1BqAMnzQahjk4o/+qD79s0q/EgADIbrRAcwHgKULYoCj1R/8wdIrbAAcMPMRIC4F4FD0/gAf4v3cjWMTAGQxbDZtd3pabR8+lHGzYREhMaYhIoMAJmeaEOfOokaPE41E5AziQLm+I2eg71QmXVom95Ten+hfvaBIErOKgbl8cwussFcgAXBozICPYGgq8GaGrp2LW85Bbs4qfG6O9PF5haeNMw+awd63Q/2O7ZsT4/E+OX+G4jsFS+Td5LwCIruD88qgdLjKPlV96trt5nYT6z7qwxjVWNRLDJGNlOmv7XdNTeGWistTsTR678GhEwPGlDKrXDYNox9l8IP0pucAMGbu53U4u7vlbs10UOGPOnzsQpsEKzUt+pgMCoKCWOrEhEVGHLmGShw6T7mVrUdOc1WIGAXVe0E3PXdJW5IMHqnzVblAZ+d7UaQevUYLtObjwq+2ATw22vXqfQcLIohBQ4CMapD7B3AQAEMO12P+VSGCejRVo0ygYvr1wQYbW6WAriU0ZMka9Wrxv0i5FT2XnrniwSWYEqcgEuQijAQv6r349JrZEtyl0ZjlH5Hu8vBCBRASEAMApQMZENIaEDaIuA1+VAhBxFFIBiBwYsQzsDuDMwd/cW1vewDZ2+3bzaNxHI6HgeZa89E0mgJCm7qGTYp+gGqT54JQGRK3kwuPT399ix+ohHEn+gGpUpCQUGLLIyRG3ZUKOZEkRJUgeCj5+QjlPpIYAQEh9YJoMNcsSLl8AKCrIxnZEEudyNWZ4I/rpKU+dcUSJIoSaxm9L7UgHFPJjNHaWjR1DZVz0P+A6j6unLHyA7BJWh5N4GsXyK6OciHSVbCDIkL5hLG+o67RqqoKI3yEYwpqFPbGGBVR8ES5BpMZVATZCjgkQZ5mLjnJYVowv+svRYQCwKBKjQTAVBWzwqK17I3xufQFoyYgFcSDBhMUPlSItEYUrbNai9A5M1ycnsrJc89dDD9E4KDVr/96U11ctON2e3R6/frCv/baIXt/4JxbsnMLz7xkkYNwbCnGKIQsEeBAEJca/QDEmYi07H3jxrGSvrd4cSH27GxA73upKs/p98YIQTkMhaCytqGUJAdK3IZIpj/pj4MP3zTVOJs1Y9s2rF/5RPZAlz80qciH2Ztx9GYYBgoeh8HlQS8Ggon3sXRdN+YCuEaQWQXsK4FrM+Tn2grXc4L1zODFrMHzZoZnrcOT1snDyvH9ZuSHxvM949wD8m4LwLvxvRIZeRKEvNK8sgjwYUtKlWpWzSKAaGpVUzUUbjECUobJKV958kD5ijYXEZNjJ5499r6nxjdJrlF8cQ025hl8ZvGjCSAZ1nJ0dtLpCvPXMDc2R92XVKwSFonrUUZh4Q4IwFC6KYiUWhF9jFCKdBCSK7+0pPR/EonRgWnx+cguJmmpH2RwWvOx4lV3yqebNaxHB44BAXeAKe3TVHPDyBBZOd3Aoy+zPcqe5TLqweVUU/CwaKmBxixxWV+j48UcF01DddWYurakMGJMAo8oLM8UTJEOhY8xfo7B9zw4J07FWT6Fm0veWBn5GwElRmJGRVoIN4n/RQa2CFgZMJJbJHuN4moNFSENKmPM4MmP4dhYY63gP6LF8YX5C+O38dsMfzFtb3sA2dsrr8Dmzh26qGs58N40GgWxFuJ0dGNwbgx1uvdeoyC8eFxxXV5n+9DrvNuNICAmD5dTYnMJOuaOp/nCVR+h914OSBRGZiBJxgiC4UaIwgJMCLYUFe9Mes9QcuXMj8elXuGTpk/lP5UTGyPITBJ8BJCqIhhHznUsYnI61ug98odJvbq6mB1L9EGF+fzy9NGPD9rR7Kroxy6olGxoiN9AlTEKHlIl8MCSemWCV+DInoJA96UYMwMIliGJUlXqEbxHsRahqoSHAUDEm/Jzk18f8n4KIGVEMCj31rVQVbEJgrpmqCov1hoFEH0gi5C+FnuPnEpN2Qe/FYlzdtYAcgEAa2YKiuuLcZSzu3fN6Ze+9IL7KCMcmwAcfO/eTKpqcdr3h/7u3YO1cweMuIAHDxb+4cNDBQ7PvBDvlx7gQL3oXmSGAC0Q1QCg2Gcz3Xli3pphWEPXSTMMXHnP3LbMIhxWnlUAAmXYSlVZapqDiogrEyyBiUA2fMyPHltrxuVy3h0eLrumaQdjrM8XkaRCFAMQZZnZeO9V1TgOZrsdqvV6G3yPJfRVjNPVrvVgbIdQXyAcoMANIhhrC8NMoGt9kMB6zrBumc5nDs5nXh62Y32vGfl+PfK79ejuknOPCLxDkV0IuWKiN328+vjRreZWE0BD6zrMrJ4l+KjnpAAS9tiYBhRALNpL+Ag3EP2wCaJrrsEbDxVVZMlCTTVXFG8KH96QUYgxWkEyk5nZytb/KHXCIqEyjwIziBRgk+mfoyRbgY8MI/G4D7de+l4HAlpjjIJHacgYyTSlHbEeJ0AsxMA54MZ6f5TzHpg9j95JKjzveRg3vBku5EJrd/oOto5BpIDHtK4uh0QjMUX4wMw/KKKLHfgoQwVLBAJLylUBjxYac4CH7QIXzZxmtbZqnlHbtMFXWAdZMhSrIil/5lyomaBKP5OT1IVNP0fH23HD237N616hRKMgGKyCWLwfLHWWzElZ3EHnda/4wcgkIoaAKoNGEBANxChMX1G1CerDemipHcPaAYFHwggi4bhj4TFE+zz8xbW97QFkb4jIv/d7Fw8XCzzUKEjbGp2IvvZe2jQTxMd2vKkjFjYi045YHzbT58mtd3dfgygfTgHfoDj3FpHyr3IESlk7O/M7pPQN1HVO14IYbU9dslDXiDtwITsgko1gtx5mBzAeM0cEoXgiiq+t3hjKc0Bi9CNDiEQAqSoMAuu9jAAgHx4+rvza5ywnlHQJx/m+H1SE5PGF5zvRtFJoTgk8oMo1H/ayoBxMajQAlOamRGFJwyKCfLmRBkgqbCBCaS8pRMBYLmuEGCBNwde7AJgSgERv0mMAJ9E3aBogVUr/AmwapqoSStP0fWrhD8ip5oP03JyHFw6p/kM2AHihgQfmGA25YCbV+empP/nqV3H7EbS+td3P/ux8WC6Xp+N4PQDH0ilw9P1CFDS8P9RIB4vEvTAfsHrvZwocwFyBiAke8LL2ogfEtFSfQnpY2pLBbAbsXCrwHUcfTFwq6Q0Lx5ypDtvWkUhFKT2er/jnfxmKyq/FdV2Ni8Wsn89nm7adjwCG9b5Lco2KABJEGUSs966azwcbnltvNtt6GJyCSR557yUIneNCnAXPkQEah1BvEJaYRh14K+hrwaER2Cw8rhYsqznT6czBo4Wz9+aj3GsHfrsZ/R3r3B1i36PwVRCi+5ealxZzOzeq2PHKthrxwLZqUWFEfWtaBQkkJBAWULuMzFFUpHVvJc77JotB+hwJQpX+twynW8Ci2sLWw4+IZfgAvPJPPJcDCEEyiHDw5Z8no/hU7VE8A4DbwGbQ82mrWqH0tXLo2LL1mH5dXBaIq10Oi9QzxcjAKM47HTAo20Ev2C9YW+2uRw8+McsUPsr5KB67bBlPFL1geryQCAbz4Ms/qlLrITAph5tGPA7wYBawVIHD1hE4KttQo+VwafAghRtGIWFKCygnYvDqhJHFo2MHI2+5G+65e+cnctINMHgIZsSgPi7s2YKNJ9Cox04qIRo0toa6MZDgo8ZaS/HGCqteVVOtAz6HhpoxSMHXe/ROrAxkaFQY+c33ftPBX2zb2x5A9vbFLx6c//7vX5xtNnjAjG1d43ocMaZkVRXN0lwQbrzHuXNgr+4G9bj17n9hekSe2HY3b3bPWQ4SAZIhMCSAl5Uc+fE78xxAKDhmn+s+RAgQCAqIIEwiHjxNDXrK1CsExCeSV07RSRmzqfg9AgiUjljWElSVRkHC0opXTwQjM3wUNpndktYiH/T5JMFFK2lYeT39fj628Pwy+oCEeFlontvphrWUyEfM0smF+iaogEjwmAv6I9yhCLL3CapSdSowInECEYj3MaMeEwxGlFr8inCeO8EmZfN4QlQ4VPgoACKmruMarQVJ70MBRISIfan5SNff4oNGY6Ajgq4UnItgBJBx5BB9pLOzs/HkG9+gk9/8zVvDDyLKEYBjycvl4hxg4QGOnMihc+5IvD/gcTzwQcK8jMXj4RgwLzhFOOYIQCBCV/4AEyEcHzdwdFTTwUEVfBVgw2BdI9Q1gTEoOecMt1umzcbT6elA9+93+M47Kzg760e9zzkpwwxU6natQAAF8eTnVIwhSeReBW9QBHfH8asYEccMI94YGKuqGqqqqeu68bNZy875WiQNghlHD13Xw2bTBfVh7x7XSxcFwA4oQdCsAJaPCG4RoKsF+jkHIGG6WDKeLh0/PHD27mKo3lwM/Ho7+O9aNz5C9oIEmG74kn3p4Lg6rmZ2ZgJoqKixDSqEFBDRfW1qjWyUtroROKYAUlQuQ40xEgRhJUHpOKZVBRXVUJsfLfjIJt/belfxSS/C81o9hhuplT8lOErTyAcYnHaiCt6rTvh0KwLClKIeCh95OB/muSB6K1gADPo4zrUfLqYpacrVWtbdmtfDBrRbvWPIdlWtRxBijscXMbKU2VVqgpKiHpCOKQWXUwlI/PwKH3OY2xt0bbHAg6bBOkY9aqptbOpH1lgVWht8/K6rJyz9HzGey3N6nRjZAY7JeYOM40pWXUjDW/fQe8g2httk7WHHcsG5BHPBo0bkCKiyYH1s/0xmo5GPmuquItsbYzQiMga09r7yTttPY4XD0AwOPrsvQN/bHkD2Fqxplnfr+uLYOQoAYtpxlBgJcQ5m1vLMe9S5IDEyIgL2auBAeJ+L87y++tr8g84Wnr4mIWAsv6RU6FG6O4no2oD6IhChIDWEcFOvtxQYp2ktyM41zRM7dT3ufsmr3VqQYOQRBYhi9IOMISyF6CkSgjSOYOpa7Dii7XsZf3CpV5J9mekimB+bgYLz/kmGGcimYFHOg+p2ox+7hee51iNGMSprScHDpjbEKogRIGNA4SMIM4BgVIEPVYYPAYAIF8GpsfegEMBJyMxJIuQxGpehhhSEqUFAcOmqSCMcpmlUSHWNUtcU4aOqInxIjoCENTMAGWZ9PUYi8OMYv789EQ7Wpta7Yb3yHlbOSRCdr9dy9ugRnf5P/6fPPvp+oxzrX//1mdy7N5eqmj8ax2sscsTMChqH3rlD1igHs3qFjmOFD11D8NNIGO7CRtOYMBRwRs89N6NnnmnMtWsVHR3ZAB2EbRslVYURPIiQRUr4RzSM5zcbxvNzj3fv9uZb35rLl7/8UN57bz16LzIduDLNd1Mr4JE9lmCExKrrCA1KiyaIEU1p5bZbO0Ii6ss/RBRrDRvT+qqqRIQhR0fQe49dV1NdV0hEAZTWwMxP05kBU5RE6hglMbB8aOCmFXFtTZulh4uDlh4deXnvaLRvHfXV1xed/3Yzjm8ZGRts6HZ1u52ZmUIHlShHbeuoDB9pb+qSelXgo/Cb7osviqhBGNaGUPeTG5icpvMjBR75t4kChsKRqoW20mS0PFQwQghJ/FRUftWXmRaOXLzA1eLwHvpRWxv30vtQVrUdZPAz6as6fSWrAmJT8vWSi84hwUcn6RxbWY8DOJ5GPK6q9QACtSl4lGNQ4CMdlwIk0TJ8lJSruJjhzF7Da7MDWs40BtbqT4FpG33/hhJWKnzENRpTACS3+J2klTHHAwycy9JYIEoqrIw2d+6538AHND2HF+/CwsYIG0aNOfVqS0RBptd9bepxbucjGfLeevcWvzVABT3sbW97ANmb2uc/j9uQinXiHM6HIUZBAoCYmXOsRekzZm6ZqfEetuPIS4DdFoPvVxeB8sROWbuPv/oxUDiiCEAK3GAsYJ0MjBOT4IOFgFmAKE1GZz27B0rDywRzirEqf6bipwxVPE8KrWFqT0i9yvudA5SYJ0dBOIhKIbpUlUZCnHEOYrvZYQAnAvLh4KOEYDCvdYHTvzXrsQJfj4eQyWfQZWlHXKIfV0U8puvLhkWo61zngXWaZq4AQjZHO3ItjNhU6wHx2GXqFULxROn7o5AhwnnuBnrO/TjTHsKegtAhohBJMKScdhY8Bs/Bp9dN8KGpVqJpVwqF6rGuEcNagiBFP8qPmyh8TIr8xYnASIQdoqg2InjhPcSOV0Ryevcun375y+bsg0Y5tn/5L8+lrhfn2+3h+ODBNQWKGOVQ6PBedSTB5y5V11kjHswtipjdkNTlKiyfeWYeYGNmP/GJhb19uzJpSKAN4GFQwaOuCZsGJdEycKI+9egT4Yl3Dlnpq+/ZX1wwHx9XgIj2/HyQhw+37BxNc4hyLzE95t8viZOsNXXTWKxrEwun0kur0F/RwYwnIIOXcKLAZA1i+UuKkHMORUDG0ZmqsgpUj+UPEaAntNkwIwaBNBcWju8aeLYG+NhxhZ+82ZjPXZuZ16739qvHQ/PO7NgsaG51CGEsMDeVKkGIqdEaq4Kynn6+AhzMXNbJI6kug0swOQYo5U0T0I8UfBgxNIOZbbG1C1g0eVBjVWECjyCTu2Oh+lKA7smXlClbSeV0uGPPva24MicBPgJEjL0Mfi3VUKFGU1qLKY0XTXAJAkRGGbzCB4PjHkbvweeaDBU8CTzyXXmPSYJyGeolQE54zoC73CWSH4IznNtbdGt5gAdtg7H1QK3T+iusprChsrpWyxGhnHxFWCAhWFzm/8sFl2aZK4U3pqkO+bDpoHM6vR0+oDGyQpmzYIGAmJDGoG1NdV+ZqlcfgFqjH8PSLsd5NfeDGfy3q293f4f/zgh729seQPY2ScV64x/8g/PYEcs5nQvidDL61jmIMsaHPWyYYRZkdwqOryoeV4+qJ0Q7JnuUJxePTKa9SlljEAghiWC6wwiBGAJmEzygMEgwNCzoSVAkihCFBIJPSeQ8TcPaabUrO2t86rqPKz5TegwJkUSzltB7oyAiVWVwHAX1WNgba1M9iE5H/wgysDBBn5RJ4KUW5HFwicmRTLELEafRjwIaV4BIKhkIFrnLWq3tMHVKOTNm0lo33MdhUyIh8VjYA4Y9hnXwCGEPiKISZpQEGiryYe10H+S9x7CXIIUSjscBpLynICklBIYIAhCxXudS2wpUlUhVgUZAwhoxeEzRD5AUfQFBjK+bS3tAiFgjJJ4ItyKyzYMHL5ghRhf7nkLao1x8+9t4/o//cb1+qtSqAB0McHBizBE7d+y77rrCBvf9gQ/wwd5r5OOYw1rCOtZwiNRB9L7hxMWiMp/5zFH18dB49qWX2gAe1gbgoMNDa5ZLCuBhFDogEVeKdiBCrriPISVgBvE+CpwDGEeQIN80EryQpmsdHFSmqowZR+ZhEOBoIknAxlz5u0Gnp2Oo3cDlcobzeWMXC41W6I8LVojYaaEaM4xBPIUQRPCT1njqGTEeZ12XuhIApNyyl7336uExRVcY5KdQ9KS2Ex6k3gJUncWD+xZuB5Z74WZFr9wWfOv5W/VFtaiqZU2lcDwLC3yoN8ZMYUNVoiC7x4uk+B3ULDtx4OTPqsuVEYNlb8KthtouadkEANEoRY77NJWVmC5VAIRIKFVuS6kOElSfOjw5HmX0QWOM8OTEys53boSRg3xqgHfeT6qKdoa5xNPtFHbspFvhpFKDJo/MQkQSFMlrnKZhTdvqXjXbQ+HjeXruSLtbxeQ7autZUEqzqtJPBOUEuwgdpgBI7gZ5GXFmYMUUyBEzJAlSY92l70E6n6XvMxlKKqjSdHM0jIgbQ6ZDwrVB3La2HRoTa0AUQty15ppf2VU/m806eBkc7G1vUwDZ296srU/qul84h433ZjaOENOwvOcg3GoUxBjYiPCBCOzGAOQpZoPgFbUfT4qQ7EZAshJ4MEPZgxqlXrepollSfQXrmlUMQjkKonen5ieIUiIggI/vhpX9k1OvsuEukOxMUMdSD8IpOpOiH86laEhVIVYVqGgcsTJGXL6eku83+pGtAAeKoEzBoLTaDxYcASKDyFU1PwSTuo+8IpnWflw98wOhTDRXVRXVVWWqFPlACutgQCprJQh1H+Fj0hkMFD4UPIhg0lYXVZxEToFDxQxZovtwnL0IOX1Ofi6kz5wAxFqUptHXVC/QNCwJQDAIKDcKUDiU4CW/DxZJ7yXXFEnwIwB2RNSLwBaR1sy46XvQVEbtenXx6BGfv/OOuQC4PjwGOqr+1399EaZ9L04Bjh3ANef9NY1yuGG4LgE0PPOBKHRo6hXzEpjnAGCfZhgoPv/8ovr854/qT396Xj//fFXdulXZ69etOTggms9TmlXTkEJH6a2c6Q6geO/LP9RpUKPAicAwMGw2DNutN0GQyFP/E8NFnKSP3Q0sCOoX+uBgjoeHcwrggW1bQ9MoslrFVItoamZoiKD3HkYRGFPIK4qDdiEC8xeH8jceUvpVH7XZdLhed+I9S7ArJ9sXP42JXvlAkel4OGFBYcD2IcHts4YWjwCeXRGceMKtAtbcmoosGkr0rb4Aia4R8ak0/et7uXG+5UazpVibIdsPqxOWAYMVVIT5ifrptMA6aNZiGwurFUZqqiu9bwIeRECEhLouRUMwnfzt0Hkr1sWLcSZExphW1XCzdeB8fPyVvxplup6Axw63TY/Szl1BQmm9Cx9q5dgUPHZne+hk82fomYNFhI9Z3ZpWU6/qiipr0JpS92GjJzSorpScJ7iYdNpin8rRFFc4bHLyHWG+0fRPZ3qcheWD9pRx4hgBOSxHS7YDhI2gbNCYTUWpGH1u58NBdTAsaDE+qh5tt7AdYW972/2ntLe9XbvWPGhbXFmLfVVpETpEWUuqrRbT5lx2B8lk92L78b/dUXX1X9OfKvqB0+nTUKAjH8sCzhNngaIoehM16ZBeakBBoiSdPCj5K6IdE+P42u+benU1fEwP5jXm0e3E6lMKFmYRpgtdDJLYeckYoA8PH8UVQChrKiCBYY1q6RjtqqRd7cJHMUIs5wNU5bR0faJBjKrqWqMeJhebE8bLyUwuCUJQj0/gAyh4nMBHzsAp8EGcoIO8c8krjKhPa+MSmNAgQmPQAIAjAI2I6mE0BnxdgzQN8XxO0Lao6yCjPtZZJ4/YNAqIWL5HJhfEIxEbRIaw78K5tsGv6zr+m1IAuWDmFQCECIisHjyAEAGBzc4/GLv92Z89PP8bf+Pl01/7tc9c3L37E1vmL2667me32+1Pd5vNT28vLn5uWK9/Zgjrcbv9Kdd1n2Xnngfmwwl8XD3x01rCV145bP6d/86XDv59/74Xjv9t/7brR7/6qwcHX/ziYvmFL7SLT32qaV95pa2fe66uQvqVnc+Jcphnx3aGNU6ktDeOIlr/cedOT+++25k33tiY1147Nym/LX2vlUC8F59gBiX4Un9CCh3PPnvdPPvsNXPjxgFdu7bEo6M5zuctNE1NxpiKCNqgpTFwZG3U8Y6OjIHDoAN9nAoRWgCpmdnqfJD1emMuLlb27GwVCuYvqOuGDCsITzC56guSlWtWSDWKmAGA0lh2BHDgZ/fB3fzqeffyn9zvX/n2Ob94z9mbG6xqRiLMTWKzEcb1lVKb7gv+SbTkudyAFTxEIwW5+PiHZhWkagEUTHuszA26sbhhbxwcmsPZkpbtgTmYH9iDeaDNuqU2qqGmaY22mw3Ctgn7eqra1LUCSxTWNsuE+7R+pL5pbi4VbvD9+jbi5LZjBeqmjytrJIwCKpGOqQRKnH3yfCmF5rtTzW/g9fkBLtsCHxoBqXLBea2eKpVCqkkEXiIietymoYQUZFLEKINGfJs7Hw0LAGUwjgbfh5WOYQLSI8CWkLaGjKozxnSNabQGZFjWMQWrZ8vd3+mvSL/a2z4Csre9fepTsN1s6oddp1EQaZpG2/KmKEjYz7ynhplb73EzjnwAgLTT4WonmnF1mtLjH5/c4yMhyGnGWGmtiqw+X79gLhzmNCIEQbBAiGRRfCAhoIQbCxCoUEo3LH2aekyvyR+E0fFx+x34kN19SqPn6FNZIUuuCRFr1QuW2gfnwIt8qMnnub4DJfnLwvjUnYuBWXIxunp57N8sSh5VilIgzWZk2xaNyfWdCZgQmYGGAWAcBYchwoLahFcIyuC+AivGSASvlIYGuoYgKa12ESUYQhCLkBT4CN5lryCics6B+lHHGDPjKOI5wZQUgMaUdlWiHgBVFUEk+qDgGVJtjkZqCNL7ih9CctetAoBMBF3Qhgg3AHKBiKtxxDPvec0MG2a6uHPHX/yTf9KeA9weBQDPAA6GW7cO31suj1zf38Szs2MhuqZF45pa5Z27zmEtwYPIQpir6V/Yd3Mer4SQw8Oq+tmfvTH76Z8+aD/xiaZ59tmqun7d2AAaoMRFhE8NGbvHS5GNc8LrNcPJiaM7dwZ8660Ovv71lfn9338A262L9J+++955pQ/PwcSnvsiklB1gY4HHxwtaLtsMHDEBL3/XoUh2Iho2iFUi4Mt7mkRCJE9HJ+/jcELTdR2FqEcAkDWuVh2Oo9tNynnS3//leyMd6YcBgHzwpVSNc6gttx/26hW8pGOpvvLWWG3R4JYa7E0N3IC1h2haJIRC8IjT9n7Fl3XZi1qe3eDFQwEO9SoHaeRcDz0HuR9WylWMZoiZpBrNqmt0bX5Apc6hUXio4wW1xBoHQ0Kl7oOCMFjygFQm9DHmlrnkMf+qlhztiRGAiirfSGMP5bA+gRMeYWR4SsNwe0z6GqpNYAOFRL0g6BoEkt+JeEyiIfK9pz3EZXNIh7OWYg+0qAqrIGNsghBrImzk2FgSloHnJf4BCOUnQHJ4TnfMO7FA5vzzIC6CqIBcTdYIT7QOur6makvGbIioIxPrQLqWWoUOFzTM7KxrqOkGO3TwcfCwa3vbA8je9pYvjt/5R/9oc817njsXW/G2znldz72HmIplLapvmaFBxB9AkB7laQN1zCBEMP1jKwdPeR9BxBgRpJTcTQiAExDJM171VgLhwUvag0pU0/c02e8kXuzMCCnRj8cNLUTE3Ta+cZ/mglAwiVGQJJQgVJ8LrLF8DO+Rnz768UQeyfABmHysSykXmLibqDxJsRIixMWCqsNDqpZLDDK2romqCihBCCAzwDAIdB3IdgsKIMGTjCNCSvMi0XOWzJwEHhCUICQIwl5SrQeUNCdh1gWpV3lm450DZi7wgewcKXwEoRs1OXykwQdLr+lBfW5OAMYgNQ1D22qROWiEQ70CiL4fqGsT11WFBT70+VCiLyrvwTNLbwytifACEc4RzYWIOWOGCwAKa7hwJ7z669/oN/9L+P3qEF689Tq8fWMAuD6u19c94k1kvkZ9f8Mac4wARygSC8oBoJAaTjs+ZZP8H6Tp1XEulMIXX1zO/spfuTX/yZ9czD/2sTpEOKoAHiaAh3lyVE2uPFYUAWIYwK9Wns/OPN+/P0KAD3jjjS194xsr/PrXT3CzGUEt9VpOURCFjwwhYUVMZLXNb4CPZYiAzHCxaKGuKyCiHfB47BpyzYeZ/AIiEQbvGcYxYigpeGy3vdGUK4WPccx1H/nxpc5j9+t7NZmhL82wUvs1UKkTIhAouU8srD59VgFOh2O9zLdffyTnG6EHZ9erk+2s/SxUNbZI12cAdeo1ixm+dqMeU8vAAT7/14Wb5+DZga5HP/Iggz/3533wDB+x5dkdBT4AAVFTja7T9fnSLOMFd6MzLaKqOHeVkMpf8MlI8IApnq1WyqgzHEgwj56BwQmJYWYxaLj0/Sq1EuVcDhw/6VfkJHFUrihfI3UTpcOIcS0oOawNamXkPWfwQHW7L19DbY7xeNZghLAqplyBycBRohxWfe7BkQAEJylX+WejwAZ7KYX5jj0n3i0RsDLd3bHzW97GtsVQ7EkVmFccG2EchOBCUDTqsSWiTW3rIajXSIglG8HEm6F7e/72Fva2tz2A7O39rGnoUdBB30vbtrgdRxNTsbyXWA/CTGvvoRlHqQCAPlz0A2V6/OnqQCTW1jGzpNpXFCLRda4HSOdGLPCRlUsTWQCIAQWichvexF/FX9aCMDyhGP2q1KspfOBj4APKHhHLxXABkOjDnolKl9N0irBH7z8MfEwfi1CiIAk+dM95r1aKQqYfRQVS1xAyY8zs+Fjhg6qDA6pmM6K6JoUmCqavA8xCzoEkCEGFEFiviQOE8GajkIAC+QKjpMelr4dI2PsUyEqdqTJwIgCmrZBnptJItYgzfIw58uHHEZ0W8DOLIF4OFkw/JxIUYUOCsKoUNjBIMAMHluMJjAgm8JFTvNSLAtCAiBE+gs4RNbBB2l3udOz5oh78+jMPN+NPfuXt9sXVHzyH8JvmBO4e9QDHvTG3nPe3ZLN5Rpy7HUjuemXtPBbIGMMG0U+hQ1UcX1EQLcWcE7l+vZn91b96a/7zP79cfvKTTRvgA0KB+VOAx5Vi5ui9Ul3XgTs/9+PpqXePHo1h0OEgb7/dy3e/uw7wcY737m2mBFP+UcZrw/QNM6P31ipBNk0TgKiG2awKqkXhA5GeBB6c11nC6pnTG3XOo6ZaDcOIfT8G8OhUqPAxDO5xfa1NEO/kmV6GO6Zpm5JipRn0BFHUQ/DIwUpKmq7yLyzYtXH0/s6dk+7hwzXduXfk7z06xNPNvP7Mpyp5zoActYDGXJlRV9Yl6uHZq4+RjpFHcfnW+96PoEdGv5b1oIDyUUc9SCgiQ56UrcfwmI4jfMxprulUtkQ+gmyq+SBjxBICxkConkuFgmrxeGKB/O1gGAXFMDCX+SHq82Ox6CmjHgU8ZJIqi+VOmIIHlaM5hn7ZHm1axM6A+b4r4AODDvGgXdCiqbC+BA00capGkFHlY/F+QlIhqjLSSKJnjtABXr2LkJHonj27eJ/zrhTre53ofiqn29zNGD/onw9L83Zv/GrEcT3SuDJkLiqqtgojSNIBwUZje0i4Oa/XZ7954zdH2Nve9gCyt/ezn/mZ9t1/+A831+paoxyjJt6umWWmAOIctN772lrYMusaWgCQJw0mvOov/99PmVKpA2FBuYwvcwYS9KWbU4p2AJUiwSmMoAdK2RpCkuLVhAAZQnIBAwhPoyDTt74TBXm/+hXM7glT3mN0hlNEQIhIveGUilU6npYWuZJoRz4QfOD7PRYRM3RI/kyTNjNX5CLMZmifeYbmx8emDtEPq1osjG0aolQTAREmRFLHK+c0CgLQ9yAKHeH5cnEBvqqAVytSWBBEKCDGl0MRhVK2CqpHRFV8ZIl+cIGAEoEIa1bgGMdd+ABOUAP5s0U8AsQ0h6VpxCpwFKVi8xIBUaFKStpVBl8OyhEXGRFhY4zCB5whqsxD9HjWbsbti+cbfO7BvePb3/328vjhn3oe/wGszJ8uRz9eH7UK3ftnHfNtYL6BzAvPXDlreTSGbfCmqrxBdIaIyz8DmBjBFA+zeR+X5gtfuNZ++tOz2cc/3rQvvVQ/RdTjyvQq9l6hA8a+h3GzgfHiAseTEwUP5+7d693bb2/4O9+5oNdeW1EAD2GW3XH3BT+YqPHWNk5kKc41hplqIqwzjeZ/3LqbAMelL6nrWRJfy3sOnlGhYxxHCIBBAToUQIIfNM0qrEfwPp7mSdM5qRTSJ49hQY65wAcUHJHSTOvyByu+dykAMgWPXeAxhjiknLlQbO9OTtbut3/72/13v3ute+vtW8Pd+0fHn//xGX38E7a+dcvEH8odKxEox65Ah8IGD3rz8b/Sc+/V627Fq/EO3Fl/5ClXYHSLwSMCxmMBPrTOo9XZHtoGtqZUs2Ehw0cen1iiIAiQis5LBAQSVEwiPj4PFGQUpElUYkLopVJQ9PakiIdMQAShGOX1BD7yESn3TaIe03Nl+LjaamjMApfaV9oYjCXlJXKT18WTCasCH4k8ys8ZMkvJQg7eg3dBsbhKQcNx+skYfbjx6AYexs53w6k73Ww5FoTj99tqQFAGT/7CkdsogFi0m7DeDjRsRvS6XouVrcdhc9fcXQGCwN72tgeQvT3J5nM6HQY+8N5sq0o24wibNB09pmEF0dZaiVPSRQDx6gK+oOTUIFp6cDKUYPB4eKGrjgszCDFHjyjivXrg/H+ry1RxEMF4V4EPyJWDnI/jNGWeML0gF8jItSCy2+vmSX8euqrr1eOHNFL+bEYQOUgk1X5Q8CqTJ6WXzlWw26DnSYZPvlugQMhkXHuGRtmJjmGoC8Z5iH40x8e2OjrS6IcxbUsqrGuMdRuULweYEZwTGEeFD5C2RW6a2FUKrQVGRB8gpGSxeJz8zzvBC+emSajelDSxIBbB6XDBEv3wCT7IKXw4B2Ouy1BD72ESBUmgVddiqiq2O6YkwCBKQpxMWsc0Zw+EGTPwADvHTgS2Ch8a9UDAsxrgbDFs3eHFdn58flofr+7AYvyuzI6/w3b2Bvv+fO42N4/G9YXWdxyIc3MUqSWNcO9dMF9V5KoKyXs03pPWmlpENsZ4BRFKF76SfzILOesqrtkY/XA2zPKo4zdIwaNp6GnAgxNh6RcSNL0qRjo2GxjWawWPpNNTcQ8fijx44P3bb4cJe98+xa985Q55L8bay0IZk75tUEzrxxeLw/CejpjoSIYBR+Ztv9kMVdeh0XQtRJBx9GKtncQkKaikM0EqOvEpyhGknsbRQVCMduh0864b0Dl9nP/AUzxLPQcz+gw9DICsLoU+GIhgAh6oXlepsMUXRHnsLwq+fn0xvvji7bFpGp+iKej+5E/eu/jOdx523/nOM92bv3T76Od+7uDox3+8DZErS7NZqTVRQxaOcY2g6AcfQUO9Hg2+5z6oC7eVX7m7/u4GJvaD7IRFoABZU4l6EMRbhBEtDF/QQgvJ42yLDB+VTR2eyCQIMQYpx4CpRDAoa+cPKcKcsTAPI/TlYj/FokCPca594QFG/5TgAcUIy0cpsXAGoAIYCUTUhER24OPyXRST3QsvwiUsax0zaXKC8DTYkm+oohTVKfAluWMVlzJIBmFdemDvM4VHHOUU8RgUPHwEj6i1Xw+P+FF3Re2HTMEr7x5n4smvmHjVY7+usV4ZY1aW7NqbYavHGmrWAw6bs3p18aVHX9rC3va2B5C9PY051zyoa380jn42jmbrfZyM3pYoCLPCh2+MAd3PrppSrpYuHKft60vBJED+P0iQBMFTm6SgcwIQUi/ide3TwGQs+bYgu4XUk6A8YSrr0B1MW51QEO90sJrMBSlF5NNj+VD22fAxE+Ine5oeA6KUhoVIpSA9iMMa4t5aCcbxswOYp0kswKdL09p97xkSd66djAG6fp1ahY9Qu1wHBfiwIfpBZjbTmRmYIyBI5fKBGdA5kWEAra/gIGwaYWuh1JKASEzNYoAIFZTAI0U8UrlAlGWmnAuPZZq5+lx/kWo+0jUzcop8QNhLAQ41NCZ9pgwkwQtVlVhjFDzYEAEmIVymhBXwVRUAEU6v5T0AdIbwwgBeNH7sDvyI17r18cHm7GC5egjL4QEs3LtY07to5w8Qq03L1Wxm26rGwyVKohjxzPrG2et6GByLxHAOeI8UvNKQCzJE1hgjVoXIQCQ2FwlBsUzTMTKg0YmHD13/3nsjEEEAEcKqilRVJk+y91i6ObhxjNDhuw5d30fwcAE83GoF4/k5uAAfLnherRC2W4RwHM7PJdIdAErXjdI0llO9R740jwYoIibUecxu3jxoDg4OPVE79j35szMazs9d9+DBgOMozXbbQ8zOsZQoi9QDMKuELuFD5XAYInjAMCiMxPUHAQ7JwJGLxtEjEufoQpB6BhFf0qsweSyvkX+JRQPvo3uiISIfHS14uZx7ZoTNpodtblO6Xo/jP/gHbz/67ndPN2+99cL2/v3rxz/90/PFxz7W0MGSmAWcd9K7XiMeECHDdbx1W1Hfcy+dD3vu9OY3fuMu+GJ8JI+6jyLqUVKsdF9SrlQEFI9pu11Nu6pJ6xwUOmJXJ7KQ0q8smgggpJLcW1Y9REsuEQZKrG/g3MEgCDhedBcoCWKfJpq7UUa3le0o+du1Y4KT5N/8XsteRUEFLKBoss/Ju1d0lwJ4Ul0jmgRpeNWvaYH804fMJQbpU429lOB/kMSfzoS8PtV/qPSzR/jQyFeJerit3w4bv+kf+AcbhbLyNb0aQp5gBCMYWHn0XW/6VWObtRhZW2s3HY3duTlfo8HNrJptoIVzeBUY9ra3PYDs7ekGE2L/5S9vH3ovy2Hgltk0qROWrHIaVmstNswxPasSkQp2LAFH0gREoBhzGjjhPcYUGQB5UvRDLadgAQcj9CAeWYIHRl1DWKc8bML0SNlJhcJoyUnwKfgRaSDDR7pzMpUdYcdylOQKCNkt2N6hkry6aqI6kREi8USM1po8D4QkdV3iIH20gPfI+pgIUT8wK/UgIrsgUuzgAKtnn7WtgkcYF1GFFCy7XBoznycAaRoMotyONp4vA0icSSelwNtaRrWSpcCMmKIJKM5BWAsQARX4EEHDHL82GNaQox9S4GMajUjnSPChx9P3kCFFL0iYyxoldxajDB0ZiAQvYa10UwVMgwwLgKgSgIDIUKFsF967A+7t8bA+OuxXy8P+zC/6h7JwD2HO900lD9HQKYEd9FVB6gMshcnBlGTY54tdXQehyylPCicQpF7GMX4oJkJvDDqiygRvEMUQeYt6F/EkXw34q1896Y+OrPQ9988/X9uwVlqMhS2XNRXk0xcu+nEYTAQQzZlTrdcS/TCkbyYkw1IYXTom6PRG5pjST3l+CE0IEIjIHhxUFN4DHhyQ0+cFgNlut9UoMtuenrJ03TaQ6ljXtVeAySRIKNGAUnSBgVklUSLJP52lwqqqQjk6aiS8H1ksLAQm9NaitC3llKt0edd1DtdrJ/fudaA1LZuNk0Lnl+ABwHH1pKCBwJQRiUhfBC8uuhBJOsdxZAwGZUL8u++utv+n/9O3h3feebZ79OjZ4y9+cbn41CdncDCnQTwEAIGt02SarWzGDXe+kwwj0vlw3G/9KtwCfLgTfzIoqhg06MEjC8sPCj5UOeqhKnvQ9Rzn1dIs21hojpZsmuqtN1KVsYu565WJ4JGq0nA6NDBflvvE/o5j2ZWKnQtrzhUwvhRZ99yPp3yqsyfcbvrPLnjsdrgqEQ4BKbARP1n6lTJNubqi09VTkK9BRAJDpQVIbliVbiicd6x7h97rAkuVYo7uM6RIiM8FTx5Y4mcXxz7Cx+jGoI67ceu3quGhe7g5l/MugceHMAMXYmQ1mGEd1uvOdGtn3NaS1Y5Xm7A/J6K1rezqv3Px3/lg0Lu3PYDsbW8h6v/gd39Xa0Fo7r20dY2bYaBZKUhnBo2CtMF34wh2t/A8FSMDZa/CZBAt122w7tM4AHzi/8Fzx6ZU/IEggCz6LA/CSKJAAg4w/mAL5V/tjMGjlKcjYFxepmGVUmQqaVgGAOXJF/iCuXA7d3SagklJvXo6+CiQYgyJ9/FiG3IaVjhmRQGkDCjs+8v5J4j4IaMfV9eD7A6ptxYowMfs6MhUKfXKhOvIAiCGUgQkFqGTtSVrG8B7VSpCr2vhqgJMYTDBBBGiwADbLfL5OSg4cB44aCiYCBh9TB6DDKXjafpZQcnQwcyl+DyCiE/wUSwNVTQG8TL1L19SEBNRWksyzn0rI2AQQYGR3PFKPYjiSM0KHaM75q059NvZ0XjeHIzn/mA8G+fjA174+1zLCVrcAhgfRADQQjxBzvWTsC4hQFYLPhcsi3pOlfTxkktSaCf2Mw5rJVFwYR2kH8SSNs5ONSNiET1574jZ03rtx7/zd+66b31rRS+/vIgTzoPA2tR5wBjMEBQ71HoAG9aWlfpUAJSRnXJ76/KDoWTm0DmtsxhxHF2OrFSX7eYg+qkpVAWwEQYQhwjDZqMlG8YbMxMAlL4ndq7z1nY10WCIHCEyZJsOF3xqs5bg6KgOP8Qt3r5d4/XrNQYIAtVyaaSuKRZcNQ0KEXAZupiiUeK2W+bTU+dDgT18+cun8vWvn4lzfgoeTwCOnfecX2C7HfDhw7Oglbz++gnsRrDU+t77v//33zm9f38zPHz44tHFeRge+fGZO5qbjkfoxo4DfMjWb1W8cRuVXwd/4S5U7tyfa9FxJyiAuTT8QxkCTEAD81pFpPcIIQOLep1snqeaU1YZjIeTYyYKyGT0x0RgZa4JpwBk+gt/kFNM98EngdcaBz9KrHPQuNCwkc1wLuf5t+XV4DHZo+7z1HIskY+dAis1yfvpr0n5oL1AvIgM0LsUxmPLERw8GWGKa3AZxLwHTpEaxIL8glIiIKXFAeSvSwaQkZ1LVUD9uPUBQDjCx+qBPNhIsA9JnRswcB58x4Y3QrLtbLc2ZLbW2A4r1GhIBxVsH80ereAF8LC3ve0BZG8fxBDR/8mfbB91HR84h+04mnXTSJva8UKbpEMKudF1joJk+IA81RpJPVH0mMc2qZXMD4UPREy1AuWv1o8vaEcBvMyFxdTZUnI/TA6eTIIMQS4j0xGECcIiraFYbrUffBmsF6RrCBYP5YM5i2Qn+/nqmchSjmX/tLM/M7AUUiMhSilYVcVQ6kLqmhDRY6kFwasJ5MN3yNrpd3LzJs1C+lUdoh5VAY/FwtJiYUxYBwDR69+cgpUBJEOmeC/hOIi1AsaUzqTxODqHMo6Am43Qo0fgUt1yipoYg0YkFeiXmpLL5kO7AwiBUxtevHpOSoaQ9PXV1zc5i8bkb6IXkVLULipfojhl0jlwDMXIgh0f+M4fy9Yd+7UseY0H7pwOh0c8H+9L6x5C5U8BYaSrZtcJEaK6FMkA9UEpry5YgRL1pcgYgsT7AiIKHcBBgdjSaAul1Kqymvok83klda3nZez7IU/6HkyYyYFvvrmJx41JHRlSK9hUZDSb1Xx42MJ83mLTVBTOBXWtoGJzdkwJbWG5gI6pT+t1h2dnawxF1HkADL5PqpPWjrih711fVTJ4HyMxgWLBhknsMI7UP3pkXdfVg7VNbUxnjRktkbOIjhIxChoDSITl66K+hO64hCQPDxsTBiral15qqiA9P4bWw3RwYHG5NBCIWYuShAgFEcsMkZL84nJrMwkySsbbrfBzz42yXFpYrRx85ztnInI1bDwJkgrI3bun5ziTt946xWHwUnJUS1vgEsWSYN/4xsn6zp21Oz19dXH+i9fgM6/O+uOZ2cIIm1ETjba8Hta8ciuvUvA4c2fjmT8bQ9pNv4LzEQHTBT8YKF3M4fuwKWxYsLQb9YBgJBQnn2uheQqAE9Jl+6hk6tNO79X1ZWMBYGEoSaeXf+H3uXdzSTNy4HyBj/DfUSMf2uXphE86D56n4KGvUfZhHX1p+pc7WSEBFQjRw6XxdVGJclyCx6Qp19NaTBFDFoWFIK+RIfUkhCQR9B0yJvRCzl8YhOjy10S9F/Ul7cp79Rr10AL0gWM7gnHlV/2pP12fyEm324YNJJ8y2xPJFMGBhXOFjqANWdr62m8EpSNDqs2KVuuW2m1Xd5s3XnhjC3vb2x5A9vb92E/8xOze7/3e6tC5NPvDe1prKpYqFaRzy4xakN46h7YUpAcj9USqAiEqDLqMgCCCR0R2TstNC4SAf5rChtJtEzHXgTgWACgCRGAApDw5HbMHkElrrrgmLEZk4uFc+leSISbRDdD1rsm0ZW+KiuRDuyD15Anq8XqvZJakgYReqspgXTNqilPTMG234t8nCoLwZHtKUJFYeH77NoWU/djtihQ45nMbvDV5bWYzfV8KH4Q7MwqQWSQV0pfDktP3AYdBsOsEFwsM52NzdhZTsTLNiU+dtC7raERQVMxRpVaaRdL6KaAaMrdlpMR8rMAMeKJUgwJ6Z1gaEJiJw4UMch06OeINH/HaH/G5X46nvBgfjrPhgavcyYjSCbJ/zJcXMHthXTzmwhWJlEQIjSlROwFmUIsQwiys3jlwGgVRIEEUSUXniG2LoCBi4r+6hTCDRic4wAhstxFGMHhtTRthBECJTzQNyKxWvdT1Sof/SdtaVF/XuT6YMIKI+pLypICz2YxycrIJ5x3hCSaIxMzGbTZxQjgTYXXjhiiAGC0O6nsJ99VB1dj3bU80N0QDGeNsUNU0rH2fmyBT1/EXx7Be++HsbNS6Ff2htKFOovnkJ+vZxz5WNc8/T82tWxRmnhBp7UvTkFRVyY3EDBtR4H0hZig/JFjy86wFjY744+Oab9yo6dq1Bkto7INEZKrKBjCawWKhaazs3n33xL/11hk4l1LNMnjsggiVQvzz86H/zd98zZ+fvVSd//w197lX5ptrrb2QLqZgrV0AkPHCB+xwp+PpGABkuOfvdVr74YGF0hBSBRD24OGDGuE05Qohd7yi4HEa6ipX4xatyU3G4z5XL1yOiTTZ53oGyU/ltGNOl9gSvNcV8/Qv/aN34GOdw5gKrYeOt8Par/sVr/q1rHsExBLt2AWPDCNRjAwYrMzsyOlWpcuV5MiI5PsLfGCJgDyBPq4YKiNwIRc9AaIVS0GGgJgkiMkJgDCKGDY+d75KDKI3uawByW13g2fveExF5zL6GAXi7bjmbR8KzjcrWQ0KOFPwuCoL9wmjdFnrPoIugjYqjXZ44zu23KPBzlufoiBz7N69+e4G9ra3PYDs7cNY2+KD7ZYO61pm44hNVZlN08g6teEVBZCauUxJh/oyv0kNkPKfdIyJUBI8qIdc1BtW4AAifBhjoPwfSR4/D4QEgEv/fQYvpKvyh+xSp05ksDwh1w5A9PFWeCK+Q1SPyUPwQTApRi9jzaZZIILfu8YJCwikveQ9PjH1qjhdEKHk6zzUGhDnFD48aHpTamZEtu8di+AToyDyoXJ90zXR8TEG+DBVjnZYBQ6NfgSfRdi2Zhc+io/gYYyUemcJhuOIQQJdJ7TZCM7nTMsl2PPzOMlc0vefMRh/b90QZAApHVkx6ANkrBNjGrZY0uZEveQZIewcACHH73glTq75LRxjj8e4hWuygiNYy9Jf+KU78Yv+3tD09wfkLSP7yc/EFVGPSVhvFz5KqhXnoRK53VcCkRT6wUnVPEKJkgRXl3CNyMiILCnPTSBIi4eCtzGHT6RVeBHnWIZBYWQcN5sBVqutRkkoQImSAQEo3XI41uP5eZfjg+n1C4AU8lWNI6tHeDpjIsvG1DrhvK5ry6kXskZSBvB+hL735BwxQOOZW5UgKq16MsY387loX3BYLqEO0DL0PWwBpF8swL74Ih5+/vP24JVXcPbss9DevImhT7SCDUaAEMHpHBNhfiI07LYhlosLH2BrDJGLrQT7AL9EKwgDFuH69YMAHzOFyNC6+GRcr8f8ddUXKjQsV4FIic/yduvc/+v//SZfnI+8/uJ1/7mXZptjY89lK+tx48+GCB8u3Mb7/n5/n+9tO+hcfLYKpaRNYZmc/rTggYCgvoAHAYF6PV6sTNo2YrDASDrCnCVSYIODEas5QX0QYMmDnCBIPOKDSoen3GbWTQqtB418XPhVd8EX2xM52QjK94JHziTMAHLZQDeXv+Wi8lLzoftkT4CPnet3LN/IAgy7Re/Tbl3nfNEfwEFTY2MRCEtJobDE1zRoKMXkEctL8iWwiU9jQEvheWy92/vBacpV+Dp053LWbaFzLMxXggeCvC98TI8SdGDgLGgdpanY5Ldh3QFBDzb6rq/7fj1bd3ADRngf29veDDzB9ra3f/lf/q+GrAjQiegxzcp7MSJomaEOUoitsjciUKsnQipJvdYClTGuaY3x/qASfoBkKJM6D9npGqUqhoCsj8piCJ70GILkx5oSN0dhQhCT0q8EkLmkZFFkE0QjSOoxq6RAlWMASZczF6+IbmR4kXh/sGmzx7wX3V0R/UAp68vzlV7CmaY41smoct2EaF0FlxNMSAc/fOpVsXjdFjJY7FwLz0O6vA0y+kdmVYAQowAym1lT16mae1fT9mdEKHrOHNWIxdypQD1+Ful7kYsLzS5CfxmRQJ/SorLyXs+h+uBWRmjJ5PuTQJEEpEHGY+jhWVzDK3LCL8kjeQEeykv8Hj87vjve7N4crm2+3S22b3Z1f39EHgTzt+F9oh4FX3eH2+mH5aHveRgG7/TCMnhWSPBeMqGXKMiUM0suY/lHhtYYMkRgRZxRIXprbSymydICHZWFpqllNmt4Pp/55XIx1vV8AGj7zcYMXWcH76sxyDGbmN6lPn3xAZQay/tTJcOs8lNePBQPIuAR7YBYu7ZtA0BU2Lae6nrgcbzgs7OQJXL6iM/Pz0WjMM6JIFaAaPNfHIyIVGxMhbOZhUC8+gGd/iB+7nPV8pd/ubr9V/+qvfUzP0PXPvMZmr/wgvaHxnB+zNCGU6i4as5J8bvy3muqm/gwaJFfe22D//gfP9Lp7vA0AKLDFG/cOIAXX7wFzz57HY+OlmStCZGM1fDaa3fh7GxbqB3T+xRdZ4Ee2O24hUHx6/PmWxfSdeArMttG4KHZ8ok/96c5+nF3vNu9599db2QzIggIlk7BAqWULl/MPgnbIRaKg0WFjQoqU2FFEULwstOVnqbADArGl9T74qwPikXmGVrybI9skC/KOd2YczoRc1p7FXsXIx4S0610Hb1CR9DQcRdTjTJ8bAcYuHwR82T1VP6OlSEgtehLmDsIM3xMvuhlD6lCEIlKidwUUPKDqIbatNDaAzxoio7wqDmm49kRHLVajN9AY2qsTYwiiaEyK8XkH9L8ulC6ealPna1iqhkPrN6zy2lWY4Iv7Xs2dn6rALY99acbjXqcwVk3yOAnwwZVaruANT3+ePio4JGmXwWtwvoC6qAKtmCCathAFdREbeEmrGDxIWs/9raPgOxtb4gov/d78m7T+MNxjNPRG2Y3G0dYVxWFNbRVJS0AbVJ7XraT56K6y3aqORkYBfNMLw+RDlCCmfxXbcqTzf0VGTTqpPwGLT4+n4kZANVYCIHpspuWAObHlZyXBBFIgGqgvkQ7AHAybTbXLOhK0p7yMQTY6byYAxI5baukYwUnBUqeCB9xbwwGEebaD42EYF2bIK+pTpryxF3nfEpDEilF3z+41KvS+QqsRly0wDy8pmlbE0Q4mxlMGTqGcoYOXBX9mF70VZUgcyw5iOlkVRWvD6VpIHihplGx6Tr0uX45gQHtFtRP3vNlFGR3SEuBWdz9fAWImFlASCx7OQDH12ljbslKbsoF3/QncCwrWvIKDr3WdjwYq/HMEW89CCM82aYpV+Cnd2TnmVMRuXanWq+HMaTXICLYujamqoypa7JVRbqP3loycR4Z7f4UqYHJO2BWohtSva4f9SKYq6qCONHQVBzONwJU2DTWh/3oXNuvVgsvsoSLi7UBcJW1g9ZeGGM8ITJORsgXmlaH6lVE0U+IG8qUn1xcQyMAjiLsmFdgTI/OkXjPPqR++QcPLvDiYouIFODoANpWC9oJjDlCxKZ8Q7UdcOgGBQGecPnZz8LRT/wELF99FQ5eegmaa9cKvV9tV8PH9NiVUQ+/Xnu+c2eQ73xng//oHz2EP/3Th+A9X3n+yTqEDueheOo4AMhhAK4ZmmDr9dbcvXsiAT4kRJh6aw0Hi99Tzg2wUu9omRA2IrNMoyGU0/Hgd//wXj2u3Hz4/PXmk8fN6niAe/xouOfe697je5seei4X0ZhPSqgeKaf8oODVURAKNwxWQUUl3UrBo0Q8SipTKqr2+ZcqRi/BfLhtZeus2F6hJYhGGONz8/PjGxGKYWwDgHiZWwvAUBKu2HvJGJI7XI0KIwogki7AN5p2JetOOzxpp6/y3tUTUgSlvEcGzmwUP6MAAnn0kGs/IibNYFa1FIAC57bCChc0rzDRCozglL5hkJEtWOPBczgmnH/567FcaE+TSIgIC8TaDBlcD/04wOA0MqXnu+DzrSfmlj032IjFKijCnUe1yyRgyVGhPO/ex/MN0mvrgV4L79ewcR78ZWcE2QGPsn9yylVZjxE8DKxiAbrV6EeQgS6qgqJt0ACHwd/aRz/2tgeQvf1A2/J2J8Ng5865pq5NM44y8963zBg8td5zXVWyHUesEaHCEpPGrElKNUYTLEXFxoARKfARM85LXq2qFHfjZSsTklQyipLrLiQZMoc1sSEhzOCAMbAtUrJHEDMr6C2/x0ufDVSXdQIiUxApRc3BcJqGdVVh+rSAvRx7gmGqBTHiPVPwXFWs8BEv+IeBuXSc2myYEWmaijWFig8FHwqMBwdUa3F5GjSoAERBVqGDmsagSot3gsFUV7+WYFWxgghYm1ryNo3uAdNewutwpQMLc7YRqnJr3GkHK7mEEEybbJfF6cC6TUZXNA8VmAHH1KpbcAE35TzohI/kDK/zIz4M61k4FgrKneW1R3YfpL5Gip/CRzHMjrxnSETmeb127u7dDYRjTiFDSW+xqAL9VTasFUKqQHyVgkjQlSBS7HIKpIfNZiuaXqVEG57MGUbI2gq9t24cLQyD9dsthhkcDXQdNohnxvsRrR3JWo+IAsYYEaHYIYvZBl/n7lil+Em/mWhDfYR2KSBjIJxT3Pm50wt4P44+vNbKDcPWO3fB77wzAmIJ63EJ9ZWvi0n0bwwARgghqoPSN/XGDTj4a38Nbv3cz8G1j38c2lu3PiBwS1k+PhKSwWO8d290b7zR+a9/fcW/+7sP4Z13ViUSIVd9W0VS3uKNG0t85plrIeXqCEO9h2EWe3p6bu7ceYRvv30ife+oqoxF5K0IOu/TiyMSKsx7fznIME+ELyMhCojoHkcv8Ptff3joV/5G98rRnU9aunt0b/sunvUe3OTXJ4Ubg1CMCAPoWSBemMtV8BGOR/CYdreyaKctdqdRDy7QUY45ibeIDwMMHlPdickBxxJsCC6G1wwi+VKYA5CHPqbij4geE5WC8+hjwblsAnyEmg9e9wofCgy56B3UB2GGnvIfihCSex968KjP0U+5oEV1na7PNFoxN3PbYGNqU2FsH0xGny6Y2/M6drGOZhQno4wQJH3wnNrclYL7EtFgIQGN4LTQVj33doTRN9yMWquygc45Zh6wcTXWowJbak+ssGcQEy5E7BjF+fR1jYXmYw+d20jnBkjRDrWriswn4CG7UY/3AREPVtOuVCnykeFjG9RDARAbNcAiHH8QtLe97QFkbz9Ya+61LR96TzPvtejcrFIdiJ9VlUIINCIYpF5U9rIAvGSilOwRyZECyfUZAsYgBW8up3MTMYvP9SClYDiPCiMUoZRDBYiTwYEMggTxVHQ51bz4AiFxg/K9SU80YRFSYdrk/F/RfVlfRkIu4eNyOsJOi97yWUtEpUxAvzL6UQ6l2lcS7yl4g1VlgxhLFGQ+R9P34JlLEgPK9C/+H8b0PFUF+dqXjDZ4rSoKUvBI0ZiwVsE03Upt4nfgIBaiBzFaixFCjImvQ2kaOchsJgGuJJIllZRtLJEMlB3YyFucAEkKAJTZIMELorD68nVZwoi3YA3P4Qlcl1O4BhrteCSH/BCO5L6b432xshUEX65OEZ7WJjUf6vj9+qAhokUEFzxZiwoJnLousaxWzKvV6KuKhgAiVejoNM7nbJuGagURBZIEIuULfrUVEGEGGEdnttuOqspyqgux3PfkViv1YA4PGYzZ1uO4aY3pdA6HTa3LUACMR6wGZuOcq0fmQ42YYB52iLMZzF5+merQLi2Akn4GhQ9tsSsja3Wse6QhOwnnZuZuJ3Q4NfHjOMh6fWYAEMK5cj3MIQJocTnc+Hf+O+HZX/kVuBYiHxjufxq7KtqxqxhyHUd93364f3/sX3utG775zXWYo3LOr7+u6U5uFzauCn5g6CSGt24d4fXrh6Tw0feDefDghO7cOcHz8y0gSizoYsaGiMA57sNuZAYJ2wIiEfyYdwcbIjKnfe4CRgxQ/dHbp8/ImVv5+ezuJ1keXCPZ5gTXVB53GQUJTnJdASEgp+7lXkqthwWroqvAQz0CTms7BARgemyUkbUFLAvHC/Re+vGMz7YznNX513ge+ijg0bMBw5dNZtVnAEk3NclpWaXOgWPRuQwuQEenBecddCMTQw01FejIAIKTUbAKHpQBSwSE9HiADXtIh/U1c61Z0rKe0cy21JqGMnzEr4AyUk4RvoSKAloRPgZWDdjJEIvDJzPRdYU+Da8RhSeFi/DY0ZIhFMTOd6sLuFAYGSuscroagoXaOBy4wppiLAi89DL4GAEJ6zxQUGTyYnCFPRE8ngwf67BeBanfZPjYgs1RkDqoDfs66IvAsLe9/SBrQPa2t3/lX/mS+w/9h/5zOI6w8F4qADDOQSUCllnUB6HNdSAWEercDYty4XlMAJ5MmJ7UTZQi7jJDBDEJYnp7WJvs9Vwm1+rqLbpk8SVK2rieJc+7Q9J9hI/cpeqys3r0gjitASEOguRRdjpV6ZMndR/yuGZLZSGXtR+qKfJg8TiFkXxc9GDp4lUaIZXrEZXutXZiHJkvg/QIH9YyxOBshvWNGxSmnlehltfag4NY/0FB+of5cL+hXPuhmoLIY6WWO8nGcoJh4DjXZLv1ulaPzqVB8NZGWQUhY8QEkR5La4h7XeeXzZIcZZO4x1TTiQ14OIYePwGn+Bm5i5+Cd/AVeBNekjfgOfgu3IbX4AZ8V2bwgI0MgsCg9oHhYzfKkdaIeV32WbmcVFK+obrt1sEUstIgPO8uLgaNIggisB5TldKB7OEpDb1ncs7FLljjOFqRsa6qsWmafta2napF7GtjXJm4XlVV/GZ4YxReGo+4AKIZElktdG9fftkevviiWVy/Ts18TsJMw8UF9Scn6LtuzX3/SMbxRLxf7TIHZk0tD3UeEZEhAQjSfF4d/M2/Sc//jb+BN0L6Fdb1B4p6XKVIqcMA43otATok1GWM2z/90/Xmt3/70fBbv3XP/87v3JcHD7pYbP80RoQYCs3p2rUl1XWlHcLovfdO8N69U+i6gRFBFOjSTyuUQY0qyAMmS7hYlQ1g55dGPlIeB8gC5t4wzE2HdgFmWBI9qEk8wKS/nnzv5Lxg+Uzq0aLVOgaqIKVZVVgVGb1P19NWuTnqUX6DCgtHNBgkwccoozBwgRQo6Vvla1/qPiatdVlvpb1u0SgKG3GmheuDOu6Gtay7Uz7drGHdO3RiyGBF8WYsRWQgvRES5kJuAwgUb5j+5xGAqLphbsxfsC8cPGOfmV+312fXqmvtkT2qD+xBtbSLam4XZqa3iCQJSoK3EU2oopoqG/5r1Bt9zTTPxCJSrHsJsnkAY1yXuSd4WR0Hagol4bMMDpyMOPg+pmf1LhwbtzHCsR43sI3HBhnZoeNSGJ/tavhAKB6fFPW4Aj7OFT6Cv1Dlmo8VGNhE0Ciq8v4Y1vBq8Hvb2x5A9vbRFKT/V0JBeqz/aJkThARvFT4KgABIEFZBdZA1JhGCMTKBjxwjL0W6kvItrAWsKoS61voAwLaluK4qIj2P1tPmC3YSKUUcBBhlwtIIQFznwXUJPlSpYa+5HBGYX7vAR/ZcQIQo6bL+My0BppMM8cpf4YiXx/I6L6YQorokkB0AUcuF24LeS4aQpMs6Zdbi7eASOGSo+r5qPwonZBCkxYLqa9fixPNKAWS5rGP3K4WQVHxuKEdAcAofxU+lVrz3Ch8sGUAkCLrOY9e5IL3PozGxLXOEjwwd6vMagsoxmOzB6rrASIVMBzAEwLiAV/gRfEbuwMflbXgVXocX5DV5Fr4N1/G7cIBvSw0Xgugg2weFj6spNDucrKOmlFpCOLomImaORAnB736zFER8iIowAJQezOVBmP+RwZOsaQzM5zYWgR8fV9Uzz1RhRkatCtGFpv34x2eh68AsDOyba7E3Osfovej5dSaIn80Wvm2XHnEm3ldAhPUzz8DBCy/AItRg1E0Dvu9hc3IC6/fek/HiYsV9/0C67oF4f7Gbkfa+IOJj9v8IiPocwWvX6oNf/MXqxk/9FIV6D4SntN0Cc+8cjF0H3dkZrO/ehdWbb8L6G9+QzZ/8Sd//7u+e97/1W++5P/zD+3J6Okxh8GkBhA4OFoao1gGQeHKylfV6FBHD6c8oZTK8lN+CmL1VX341JRApMDLNCRUQufIvGcgC1X1x80aMnZNdHRh6aPUoUqoeoMu+THKZtUlAmAvMsYCHDg/MMhlIsKRIBSHKJLopEOMAPfcxOhHWKlHz4OMLBs/A6WVzLYquE55Anoeht9zJadCbDD4Ch++0q1O/1hoH3nQaTdGUKwfOK2RMwaPAR56zTrlw3JTh4wgY0eSIjtpnzbMHz1TPLAJ0NMfmuD2qjgJ0LKtFAI+ZnRnV3ERPrQ3YoavoG71F6LBUpdej1GOl9F4hIEt5ynsZtGhgAh54OS+lhMZHGP0Yc+qeYJi9PKGN7uPAA6883y58XOTIR4SOoOI3QVuwBTyC2rBeBN/BGv4VEPgobG97ANnb3r70pS/xf/Y/+18d+n5cOic1M5igKkEIBkVvFEYwDSSvgzcZPCio+MlQQpSUboQYBAoeVRVTyikoF2ArhGBMZUcUfR4VCNFlMj25gdzENLfXNUGUUEF9VLkmlNIBRbIm8HG5BigpTtPCcZkAjJSlGk4BJftiV0RByvOnnawuH5PvmOSoQxDnSEjyWm48jsL5OhY/6HDCwgn5OAYzRKgtd6sAIPXRUWUPD6sAHybIBlWk9SBBCiBPgI9dAYxjiX54VPjoe4/brYPtVtTrsRgBqarLJk5ljkwCDLG6T8d0z0GQ/68v2KDHQ+75OXfuXxnv+5fHu/yqf4Nf5DfkOfkOPAPf4GN4DVp4GLMH8Ioc+AwfH9pwR8UVI2Mw+jwwBxUQqioWZ4tzDLvGLLzZjDwMfhKyUyv/sBCmpt+k55+f08c/vgjdopbmc587qH7yJw/MF76wVNHnPregz3xmYT7zmZn5xCdm+MorM3j11XnQgl95ZRE6Ny2U5jEUyMvh4dI3zdIFFnXOzXgYjL1+HQ5efBEWwWvqldfOFKFIfHXnjgyPHq181z3k7fY+jOOZiIxXXzft7LMkR0LAuUFEnGjK2QsvtM0zz5iYf1hV5WIedo29j3LjmGDj4gK2AYou7t2D0wAcJ9/5Djz66lfhNGgV4GP73e/y+OabnX/jjTMJNRrILPBBzRgdZhOwvW7JewLn0pAaxIqJKvUqmIAIEgEElUoFg5jnUmDplnA5t29a55VdPjaBEIT6RPy8FWuWxpwsCc9Mbq0kJRSCKiRMgwItWCjpVQodLba2ocaENRmMN8rUM021SigjqQBdIx8FPsJ+Ch/JwkprFBQaWDiBht54VOxQHxVgY9j67bB262HjN73O9Dh35xttKasF1lvYjnqO+N5NuuVIAyXkMFi8PiZF4jEVTCFAS629bW4vn7PPLa9X19sjc1SHiEdzWB3apVkqdqgoyMzjbq6RD4roQYodbYaP2lSmzhEPS5ReI0/qBAOAhNOGjxAF2TJGFgyT0lp3mlb1/RmW29OBh2rXFDZy6tV5Wk/gw0IH045XbdAs6Aas4ePgYW97+yhrQPa2t5dfxos//MP+ZDbr5symdg7XWhMS1GTfMvOGGVoRKLUglJvKEFH5Ix+kolMSk2ZfCJsc3zAGBbFUbEswBO8hqq5RhgFgGAjGEUSVO2rl6IZgcIRg9FCJWagTLCvwOI1CpEgH4GMmSGHpgDWFkLDG6ZTtYiKlnoPTNnJO+YsjQ6ppuSxOz8f1cbqQAiTTrA5rCbwnqapSBO61mVHwrHM4TN97n1PHhejpJqTvft4CH0FI6W96eUsQNAWNyf7y2NMYYnl+dJwGgnPwehoGIgFrmQBiRKw0KgC1aaerXFckKlBj0eIE37iOl/1mvNafDzeGU3fNnbhjf0+Wco9beKDpy4LgdyuSP3zk4+kefOV5q7qmDBBorKWqaazWfeiMCBciHqLAUWBEJIrDfUM4JqkwOV3EaqFOGJRnbt6s6ObNxoTJ33T7dk1HRwbTxEgSDSlWFYq1xERl+jeW6n1MdAjS91qDMvMvvTTXcxKAto41ItLyMNQ8jhRqRmDx/PMw34GPixD5CKlXWnD+IMDHXRnHUwAYJ22IZRIoFEz+sY142DmHq9U5vPuuO/vt3wZx7tbZT/zEPLx2FeiYqtkMKRcUSYaPcRiiXN9Dp7UoAUD64EeddLle61RzUEDAHEZF78F4L+VP5fi0eV1l8vti0cDBwUwCfChsSBq1byB1iEAoLZU5mEhLzIMh6oz3HRnjImwagyb4FhHIOeiIxAcfjKW8JY5LBu/jZ53ODVEHAGIuwF//43HzmYN+cdGiXd+2cN+kyjhgAyXSYkAPkBAQlfqQ3HL3snuTGkjsgAXBnLjL2oZgafDdoIrRj5xSxdMRjZOgC2hL4C1snbarnQwyRChl8qm2IUIMA4tGBSBYTXVJBStRBTBkTAGNcrukfEQvvrR5NwICWlh+y9xahOhHszCLCBxaaK4xjRrrmMIVX8dUEDxaiq+BsQYGKawpk75A7kIFI1dguQdiAvRljmH+fwAT6mfJk8sVvkBhDwSEiY3xhnNrYiwpbpVU1EGH8uTQW6H09zd8+uM58rECA6dAcKHrqArWwad5H9MISJtb7h4E/8wPqevV3vYAsre9eV+/W9f+YBx9m6DDNN5zk+BDGhGsw17XtYhUwRMzkgRLtZbBMZYhhVhVIsYgWitkDGCQ5KhJzlcGYE6T0ocBxdoYMeG+T6Xo44jee0ABmZbb4WWBOeZSdgaiQhEQQScobgvAlMJ5uLQJZEwjIbDT/vUyWjK10j0LkYBZ8iBpBt1PbdI1a1JvAkAEYAwFGbSWY3es1IWKRaMH2qGqrr3ZbqEUpL8vEIjAFbCVamsQiYLQWhN8im4EX4ryC3wUL8kjfsCgQGl6RGkFVL62xujn09OqCCkzmQhM2UDUl55nxo2u7ddju10Ni+58ON4+HK73D8br/j4f0UNZ0BkQ9ZDthw4fAoBPem7ubIVBpOuqbY1bLmt37ZpzmnrV91Ea/RDmlMPmvbigMIBvYT71qWX9iU/MZ88/34RCcAURq+ChhTrQthijKkSQi5qQmcvUb90Aeq8qwwZBAcVXFYyIJCcnHm/fdqEOBQbn2mG9rtFanbUB89CRyjaNzsmAzekpXLz7rkY+LmLkY72+K31/IiJjLqNWTU1wUkila1J3BYiICIfPvh7++I+/e3LnzvnFP/7Ht6vnnjuyy+XMBlgzTZNmflgLXgR88GwMDF0XwYidg/IOSrhv6oE5/UDmnsFP1T6rrgnCawe4q2A+b8GYSgCswgeIWAwemU0Zsx8EGUQYERuP2BrEzjKvLdGA3nsmRX/imshj2G4BwOd/BAJAwAnWMbOcpLxMLF2ySls4exfGZ/+g3/7Y3MzPG7L/6HoFPSBQ+os8RAwRFCvJExAHj1hgH0pXcYkHONy8eJ/v1HWEj0nKVYQPubpFWLECIqKRjJJ7yPEDIE6DA9NilxprBY9JbUe6mXBDRCh+Z1o4EuR0KCSa4cxeN9fnAT7qhYm3BB/UUp1uWJvkK6pAZcgk3CmQQwS5A1aK+vghFTR6EAYBlngDlYPgAZCEUITF6YNESuctIklnzNVNaQ9knggVmL08AULwAwOJA5sjHwSr6Kvg6zz13E5mfVDQPOxn0MUoyEvQw972tgeQvf0w2/J+/evdg3HkxThi2zSm9h4bFbMPkgYAG0RdQxXWVkQop2GjChE4pdUIKHQoVFQVBq8wokoB7QQICN7HaEe8QK0q4FSkTsHreYT6IRU3F5DQVUaCXE/BUcaoFHQUZPJIrAwrzFHkfXqfsjPsI58RAaYQgqUjFl4+RsqxKWBIKoaXDACcoyAkIqUkwOfoCsFlvQnmKIgCmEZBMHeg8phmy2Gc0aHXqSKszy2Ag08T+SgpVwk4kJIl4MjXTxgUvO5L3J7kcnr805tIkQCzYBAkMYkwBpExUiboA067YJXnMgiy59r3Y9Otx9n6tG83p/3s4lG3uHivP9zeHQ/lPb9sNjGND5vaABDuXkz+0KMeT3g+EmFV67W9JSV2X9fsvbf+4EDYuTiKLRxgFhE4Oqrp5ZeX9ac/vZh//OPt8uWX61mIeFRHR9oeTcGDIlkTlTkc6gHyYL0nFWjnGRgSi3LWaxjOz23f97br+5mI2AgfGvlomniBvz091ZoPP4bIh99uHwRYuAd9fyoig74aP+ZzS9a0nzVN8xmLL280vAn/zjt3Q2H4mfvGN46pro/IWtUBWtvQYoHha4MQojOyWIC0bcrnNEZVBvlEXygcRdj0/UjbbW/Oz9foPb/vkEFrSb/+WkMjCnjWmlhakPiFgJkKhDCz0X3uaFGIXYLYI/qg2iG2CDBy+v4wGjOiyICIQwMw9N4P+lhElMwADIiPh5D8W6l6XYaXDzpaLevF6WxWfWduBYGQxAKhepKcZBp8jIRIsAgXHG6AgKVQXH0pPGdgUVOf4cNDsDJjw6DB8rx8nNSX500gRR/HU+jYNcUCTQdTEAjrCB2adkVEEUUKeCgsqOVgKHrxZMSYCitNKTMKH9rpSqMeih9ziglWihwYRBk+IHiVnrsACCp+hHXKA0XEnHIGBgmQMYJHJR58lhOGWhg9sd5v8qgmIUxf49JyBNMtmqQD6q78jfGE2o8nG77vfSMU+DCwysMGS7vdTan3iNJ1k9dzWMMrYY8/5LqPve0BZG97+8xnmvf+6I/8AbNtRHztPSlsBKV0LBFuAEwQVzkKYpiRgo8AQiQoAlzKMIxRlegGYvIxWiKIBpiFqgplHBH6XgyR6GNL4bUEMYJCSmnHCwRY6jXS+auKyVqmPHtCgiDXfKIIqMh7ZOaYBWH0XN6DF+FcfQlY0qoKXOT6kKf8dc8ZNqYpWDyFEEnHp1ET3YMQpda13qtHqmuSLMpREOo6Kdd6T0zFyhEgxTxVhI+cciW6T9dQJMwEQeJ9gRD1SYjwgYxZJSpM3bzUc4EQQOQYAUvRL0G1adceciNXrtfJecNsczrMVw+72cX9rj29283ufXtt739nXdlzb24dzsQsa67nBGo/2vCxCyJgUjqWEc61u7kVq+jY+U9+clF96lPzEPFo2ueeq0IReAQPLcxRWn9C69knz8PQ1xxHRo18vPHG4L7+dT++9Rb1q9WcEev5c89BG+DD1nVMcdqencn27l0fCs7PfSg25/X6Pmy358I8+vIT/xQmWdkhPeYfkzB73m43oO1623YVVVXHaMwBD8MSz87q2L1iPgdVWINpGpDU4QJK/2cbvCXyJDLQZnOBd+8+xFC38lj40KE3Bwc2zPhocLHQE1y2sSsDhnK0AzKIxLxJRANJVNrbiXoA8QBtBD4AFXJOswrGmGpmekA8J2MeGIBVJn+1x0ZCgpeSJNp+0/evXt/ai8MjM7yysGdVlV8cAVMRQvFllkfcs97UgBEQGAVBrQDKKLHbFfuwm9a3GTFYIig4bcWRp6KXx4M8OYEIlerSrRSZmxwHIZNLu3OROagHTPCBgIoL+pxK61mu0bX20Bw2B+bALOzCLmlptbBcwSbcUJXhA9OM9yoCSFACD8qVHEgAKFoqDuChRIXEoMHUuDhILBpOdYgEBIIRw7gk+AqXvt55rwZJOeWMw/oJRVJP+ZsJn6pAbcjdrlQKH7nuIw8cnBabV7ngvM0Q8jD4V/fwsbd9Efre/mwK0uWf/+f/qxvv/aH3ChhsvE8dR0TEMivgqnDqDaKU7qE58iFRVSUZOpJXSAhSnyMW6kF9rt0sbXQvJ17nVK3oS7QCUc/Hcdq2AkjTqFIXT1XbYvCqCD6iPlY0E6gEEcF72b1MwksPgLhbjD7tpimTrlYl0iFS6hvKfYgi6vLnkWmTG8h35Flk6oWZIdXaqpcIXl0nflrsrvY+8GGJjAkqPY4VQKDUfVhraLkkq4Xns5nW/RqNtATpBPQ0nV39B+n9O46iReex7W7pfLVeO9hsvIr6ninVoKBaKdkR60eeDevhcPOoP169t712+ubm2oNvrY/ufPXi4Lu/ezp77R8+tHd//wz7B4OZVVbTcuq2TbMyrI1n+zOu9xD44FY6NSAZQ3UoCl/+2q8dH/7Krxwe/uzPzg4/85m2efnlxh4dWQ2FARE+7eTv3c5QRRpl8es1w927I37zm53/gz8Yhj/8Q9/dvz8Tovns2WexOTqKF+9+HGNh9/bevSE859T3/X1ere5L151LahQsDB/cZLLGx6VklfZWCiHj2AlzB4gjiLggCccJNhuC83OE8B4h1KZg8CoTojXm4gKq1UrsZuND1GNrHj06C487A+cc7H4D2taGmprWvPjizD73XEuHh1bpP4YkjUmNrExcGAwryj6KSJUBJBl8r6gIp8cATCxaB5g5kSMRqZGoIyL9jFByU6+4zsTSXS2uHEhz4dke1JW7dlSvDuaGTEOV3rDSC++4KsXSGCx4LL8iUhTksly6pFvpwD8PvozeAUw9bst5UNcAl8fVS7oJJMOngA+FBBuLvk1tK1OR3qxJQBIsvufoTXrrAkpAqI+sW2qrY3M8O7bHzaE9rLTcXP2yXtogs6gXNK/nZl7NKa9xVmtz3hm2VUtNFV+daqtxmKpEWSjRWoyyBDn0Yc26DhrFFa+IBg7S7I+gNMUdXJxSrsd8mmsS55logb3qAi56ve9Dd7vAp3gsQV+KzfOQwbMCH1lT+FhH8ND1LLfd/fE/46Lzve0BZG/72SD/wr/wX7DOyQyALKKQgkeQAUATfIUY11lgEVNbSCIMKpEPUA8FRuo6AgkExbW1sdY5jwRIAoCdLriSU7kBvRf18RhRAo90LsamERU0DagUQIJPEKLAk68rsiAnEJSLfyiGV4x9KLBRJn2bIE2RMuE1KHfywjSfAqFM8S7Pg2lr3+zUkhcox0XKxSOI9wzOifogrY9RDxOQQRXudgq11lQJOoiMLtJVlCASpKxpE48E6DBZ2LYUZEABpK4pyloKBvi06Vd9LwoeueuVykMAENxs9Bhj35dvagIG6wc/7y+Gw/WD7ujive3RyZvbo/vfXB29+Ueni2/9owf1t37rHp1+Z43juSvpMXW4WKwPDpq6aYzWUph0QffnDj6m3ZXqL37xaPnX//rx4ud+bjkL4BG6QTUQqHAKHU8LH1MIKXLjqN21BMIAPgyTv+krX1n73/u97fjlL7vQd3vGiMvZM89QvVikLhJaJP3wIYd6j63fbh8G3QvwcU+GYZP5GjKAfGi7EkKyJEdEQCHEuS1wLJsYBMABIufJlITeK/2i9L1SOsB2C+HzIq/XEt73VrbbLTrX4aRNsNZ2mGefbeuXX57bZ58toEdlQFEMGeqaCMKeVIRoM1BYRJyCSLm+B5jyRzLIxyV35JU8mBJMVUEVFNYtETVB+vnG8sviaSCEtiANe4DjRdVdO7T9fGaqmHpUxWJuQsJskAvS0yaxr8qoZ2Eo0Y/StalEOnKr2QIgmLthQ6Kp/LnzrzoReUKVCMSIRu5IFQGkSjdSWXMZAQlr9aWA3YCACXvt4lUtadkcmwQfB/WBjZ2uqgAeWoJeReGyWVLYo8KHQkdbtwodmMFDXwts/B6nTDUPqTw+QcaILgMHp4noMTVrkEE630lYc5ne7mK1ltKtYw+6j/UzboRRWwwPOqzxRE62HXT+sWDxYQ2zBDgPETwNKlEP1WoHPhQ41lAKz5sMI4dBL4ODve1tDyB7+7O2f/Vf/a+c/4v/4n9pMY7ciiAlkXoTfAYPCQKTa0EMYilAhyl8kPqqYgWOIAGNWgSvj4V04S6Qi5J1r1YGIkASlqGGkqMFeb6IxMhHXUf4yNEPgbaFsAdJe8SqKkMQSyt+UEkQqWcur8OPCXjr+0/QEc4bXlPhQ9dIKj1eVaWlMOAlVEwiHnlZwKRYipjAJApyKe+jYvOiYQBOj1ebtvUt8EFVAo/IHrrC1D2LUNfJq1IJ53JJ4TMQNU2saS7woZ9BzxVT7OEpbBgAui6Bx2bjUIcOql+tfDjGwXOshQYWqdzgl915AI/73bXzdwJ4vLE5eu/rFwdv/tHJ/I//P+/aN/7hQ1y914E4gWIKH7dvz9pr19p2PrcBQGwVjgEi/NDhAxEywZb+xAgi8IGtqqj51V+9fvBX/srRPHR+sh/7WAuaXvQEuyrt6orIh/A4Al9ceLl3z8F3v9vhV76yot/7vTP54z9ejXfuQL9ez8dhOCAFOSVoIuBxlCGkZ42r1YqH4UGAj/t+tXokzg2YDOTytQU+vCGVq2rVxKabeJ03DL04twnrDQD0CDBGEFG6BqBcEA5R3gM7h+J1wU4fi9Z6EyIc5uWXFwoe9XPPNXECZ9MQ5b9KqEf1REDJIxJFks/t4WyQgaASTsyRLCaiotLmG0oj8azcWMvEmSrNbCbz+VwODg/dwcEBzuZz8sydd87nThlSkONKCMlDjMy5902Fxt1cVptrB1bq1GIXcxXFZGI45ueSSkAKiBjFLUFBBubyfc1dqbB0cVJvIKGIrglK+TYVwMECLiCPjfqhTiNf2EWdox/fCx9k1GP5u4lKQAwL606rOaoGm+rAHNQKHxE8FD2qGPVQUZHCh0Y9NNrRVgk+dF3ZCvOAIZRcreeBU5PcoFEGHNnpvkxBh5576X0vW+4SgIjjoDGCR4x++AIj7MB5jXyE54wddMMJn2xO4KS7bHGSBT848MhrLtGO4C+iFD7qHPmooIDHZqfdrh5fw43gn/8Rgo+97QFkb3v75/6531gb45fMWKXIB2YAAQoyAHFtEXVfUrGggEVQjHyoz0XpHCRIxKDKdRzlgry0aMkRh9LZCaXAB+ghSWuiEv1QcVBK60ppWBKVa0JAZYwKRX2+RlAVOEBmEDVdl3x1yKbvWYEjRT409VzXiAU6rI1eX6tcx5ThfxSEzKmQNQGDSqJHzOv8wbwvDXt0HVWiIRplCLvJX1fz0pjU5TVDRkpdoJSaHhaYVTJJIEEJwmwWywuwaRJ4lNksqU7HxGjPk6Ig3it8+Agf6/U4jX6ARj8uLjx0a8dmHNyyOxuO1/e2R2fvbI8ffjenWf3eo/ZP/r937Du/d4LDmYMd08mIze3b81Cb0LaLRdW0rS3tba8AD/xBgkcOG6G0bS3zecOLRcOhJWu4Ypz75XLmFgttz1oBBfPev0+BM+pjpKostm0j4Xn2C184DmlXy8UXvjDD0FL3aYtuHhftkEmalQ8Q4d9+e+DvfGcrf/qnK/z93z/HP/qj0xAFGcbNpur7ftZ33YK9nyEARgLXYvjNpvfDcBr0YFyv7/muOwcRLt0cstdVKXIC+ZDXTzSdsHk1hBQT8d5pRITHcSPMGwHoQaQHAJefSyrJrYeD1x9utrduQfvKK3X76qttE77WATy0zzXmCagFOqIvyrmgVCAkyEJpHZejIaWdW5DP01jZhLU1xlcqazms48Abay2qTIISCfLGGBfu8+H40FSVa5rGD+M4eu9lpxDrcjXdYzAvUq1Htkdt1d84sN3hQgEpB1aDJUcqwNLyDso6gkgwUwbtlbqLMmm8Crc8+K/AR1yX+/PjS9wnxhEeV3iuSVGq1rb2e+DDWhOMctSjwEdKVxOOqVdWHwW2muGsPjQh8hFuCh5Lm1KuUuQj+HaBOfIBbd3GtKsAHxptQmvitzDRHQpwuEXsEAcD9xrlwIFHCR6SH0DBo+NONn7LW7fhre/1HoUPn+BDveMsP/AwKoBsZTuc83l/B+6cC4p8VOCR9z6mW9lJvUedIx8aETGl0Dyozn4GXYaRbYx8vPgjBx972wPI3vYT0v9LfHbGzThiIwIRNpJHYoYCHwQQj5Puw5pSLYLk9KoU6VAhsgqDBIAxKBd7C6S9et1P08JLdL9cV5QRCTKpKxEMggweKkggkgreE3wIpOuFUqAuO5c9At7ra8R1OZpHMYAJ0vrcHPmQoHS8rlFFKaOiZG9g/PxY8r4ZqBTD51COetJ9WScI4iAISmvvBZxTr5EGZucwrBASGCCV7q457cpYLfCg9LLqMpSoL8dK9gobQzifE2WQmsAH5a8ToTGPh5BxBFHY2GzGABxDjoB4rf2Qi4sRLs5GGc63rg6Lo4u726PzdzbHD76zPn73y+fL137/UfP1v3vX3PnjU3Rrf9XkaRsiHvWtW/P58XHbLpdVuwsfaXol4rVrDR4eWrx+vQ4X8y3evFnDrVsNhJQtODiwkou4c1X8k6ADoaosz2YJNo6PD/zh4SJAR9QYBtIF8Ji7+XzuZrPWN00t+dw0DA6SxQiJwgkuFi2H5+mwPzk6WnLwfHy8sJ/+9Hz2+c83YVJ59X1O/hZ2DrxSaaA89+iRCwXlg3vttc6FNCv+gz84lzD9G/7kT87h4cMevJfRuWq73c4VPtw4Lshaoz/Iik8gsmLvH7m+V/h4wCltSYCozDJBNQiiXKhFlA5OL4jVngo8MnxQRhnMdz0BQpIxexmGjvt+Ld6vw34tAKlWBMDHaEbbSv3CC5vlJz7RLV95xbe3bmE1nyNVFeU0qChMIUMo/2iheACSIGY24hwFxVCkN6Yaq6rydW2CiDXMOpsppAqFw0akJ++3FrGviMbKmMEaw3nKJtqqwspa1LVCSIQnkRERXWutb+oa+8ggnidg9r4QQhvvaxDk6wu7vra0Q1ubjHVYArAsTPmim/IxyoXoehwVQBAQM4RghhDIkY5Yio3ZdD8tEiegyzGrAsLA5ZsZrcLKKHhohcbMzqoABLa2tVFF+ECDwZeaD8w3UoAMQkW3CqoGAc3SaKVHnPOhUqTRGg8bRAob82auglkd6z2wslWMOiEhCIpIAY9Yy6ERjgGDLqHDD6B7Vcc9d77jjdsEbdX7ngfnwaWoh/o40n90CiKabhWe7TrphvCMIUQ+1jobBZ5k+AE1NYRhAh8XYHMUxJZOV0F1gQ3d52LzeVirDoJe2sPH3vYAsrcf0YL0f/lf/q+c/nP/3H9h7hzUiGhy291clI7Biw2egk85xSwVqiXwwFKwnbMTAIALbAR5KBEQ9TsmpbFhgRAVc/SiMqa0703K4AE5JQsUStJ7KOAh2Ueh7ifBDlTl8wNiAoqqSvCRvJhwblNVqD4DSFJVlT+eBmcA8wDkEuUgZjEZNnSffblfVaIljCIp9YpZASR6Dh67Tly50lP4sNbY4IPpRhcFPlRpf5lBoi8ZxSIYs3TaVoHq8g/BxgCUtHYALBlNmD/PJOoBnKIeTgFEgg9rr3tZXzjZnm2YH50Mzf073cGjt9bH919bH7/9J2fLb//Ow/rrf++euffVcxxX/qoqetJIxzPPzNsbN2az4+NG4aM5OKiqIPPMMzP62Mfm5tOfXoYp30v7kz95aMIkcArCMP0bP/nJOYRuUvLqqzN++WUduDfjF16Y+WeeaTmcN+aHachmN9JhLbECRYhujAE6AngcjjohfLmMsOEDkLhAQKwXn9baIhABcs6bvh+M916apoEALKCwcXR0EBXOEbQI55j5tp35utbHWBsmf1utvcihpistA4eemnUA32bD/vyc3YMHfnjnnXH87nf7IRSV93/8x+vhj/5oNf6Tf3LGf/zHZ/DWWxu8uHCF5J33dtt1swgfzh2StbVpGg6+B8Qz7/3DMaRcuRT18IKIO/ABwbDsc6gtOWuJyr5Ua1M2gHisyBQiD678A9ipd8CnbvojwpoexsOwDX6Ns9lQPfsszF591R199rOb41df3Sxv3x4CeHAJU5YIR1Ep+hZmrVOXYbu12/PzdvXo0WL14MF8/eDBbAyF7nx2pulfY980zTb8PIxNY31dg29bCh6laUiMYfF+4NXqIjz+1HXd2g/DWt+bpo6hSJdhg4MgXm6nZmJjEBuAsQ3ntFVltCuxQiaW/NNSfF7S3yZ1InrcPOzHalnZ/vrMro7nxhtCgXhDhgisyMKY9+jFg0IJg8+wJUBI6glR9wAl8pE96HrqASHVg2QzYKLXY5ZiQXmc03FgD6oQnYjwEaAgpV7ZKnW+yilXUYk+ML8PkztfmQqrBgCsAaMAUuUaEsUP09rW5PQqiNGOugEtLg/S9w+AAJy+AuLB5zSrscBHmfQe4xcJPEYeuI+pVp3reO1WvPYbv3ExBuLDY3Pdh1cfNPox+EFS5KPjbtAp72dytgm1H52+LnxURrHe4yyoFJufZ22gpF3VqrBuMnzMM4DM9NgePva2B5C9/Tmw/9B/6DcEEVrnfJUvlDN8QIaRuDa6LpGQXA+S052iz1GH0s6KQYSjn3afkuym2TWXnUQx+mltRY6ABHEudFfPEITGME5ev8CA7qfF7gVC8v2YIxOIRAoWYKwt4MG613XuvqWREMzF9CUCIqUgPfoSESqRkKASCVHhxJdMLGQGSRLJURD1EUC8B7ExJ6HUmRsqEJJGgBnQTYl+IKpQ0n3IIpC7gsbXggQgULJsUJXTx3JBPHEaog0c5DcbLwE+ZLNxxYvCx2bteHvRiTs5cXTvTl/deXO7fPc7obD8T8+WX/u79+pv/+MH9OAbF+i3V0Y8FDyqEPGY3b4dNX/xxeX8k588aH/sxw6az3/+oP7Jn1zWP/VTy+rHf3xhP/nJWfXpT89MqJ2gF19s8IUX6pjKdPt2FSIfldy4UXGIiARVY/AuzHdwAWDiF+bRowHHkSVFKWyISswDcCzHAAvhcUsXYCFCR9vWXFW1mBzLy19ElWcGcc7TMIxmHIcKgoXncQAXCRGPCBzhHNw0tQIHW1uxiT+NxPr8rkMtXR27DkLEAcbtFlzQuNmAC+p1wvfZGXQPHvAQ6jjcO+8Mwxtv9MO3v92HQT3b/o/+aB31h3+4Gn7nd079V796wW++ucHz81GJFSVPxpjAx9D3ET5A4aOuRzLmgkVO/Dg+DO/jhMexLwVFE9AA0c20VKOss5Wi7QIhUXq4EHx5zKR9W6lj2OWMcnb4AIZhovvsp37q+tEXvrC8/ulPm+OXXuIwy8RXgRdNLvqehialNNrqOt6E6NE6/Lxe3LvXr+7f9+v796vNvXuHm7t3j0I9zMyvVpaGobPMG+3WMAZAVRDNcKYG5WsAQdEz6z+QXsXOOR5HhaQu+HXYr8D7lTCvQWTIdTCCKY1MU7e4rmuN0piu61wZg15AsoAIZAiZzlOpzjdOri+q1c2FWc8q49Nf+i/nWHBeg0dmJkafpuVjjsqClDCX0T3oAjNKYhSW2RylvqSkZhUsqSjetF7DaFLUvIopVxr10IiHtSmZitRnJe4gwgwfJfVKPVm0FQFVIkIlktJgQzMTMSR3sqpRIaSylVRUSUm1EiwzTXJ1BqeoR/QyaqRD74EEI1rnkSIeW99JjHr4Da9dwA9VuIXHO8fOjeB88qNT8OhzzUc4g1v5VX8KpwofWwdO4COwXO9xMUm5ukjgEXydIx8KHjargXUEkkWGEH0MhvXHwcOPuu1tPwdkb3v73OfwURhQGACEWu+5aluoRKBiRstMYS1BbI0hWwDFe8ZxNIAoWVxaQJXaDxJhLAPV0l/rS2qW5L/k2zhUkBlR5T3oGrxPYzuYPYgAew+ox9JrClir14aSIx6UG+cQBg8UTCS2owX1mqqlHkAov5UchOBcIM6U35NJ54syxmDu5CV5/kd8n/p+hQhUpP5yUrB6FJ114pzwZU1LKYgv3XLQp/R0kiTD+nmqimQ2k9p7HgsgTLvtXMIHYilAz4kQklPj02tO7OKCx4cPUwF96lzmMXcGk3EUMwyETePRWmTEVHyTalK8poShXiNpBKRf9+DWK7EP7wf4eG+Ut9/uqm9/9ax6/Ztn5vXffQjc8+OGv9kAB/bwsKlDtKN5/vm5qn355bZ9/vmqCjBB165Zc3BgMAiahqCuSXIxD2eiAhHMtASQJc4Bq5oGxrpmBsCQjjSGGoAaRQzP521Mo9J0K03Ar6pKUuhoN9kByhfPB43ei8KHdc5Z7/WLYwN4JFjRNRFJUKFoEblU2QfIGL/6Vdi89RaE4mgwyyWUgiUpXRH63pvNZqDVqqvOzjp8+HDLJyej5r3xMHjxnoX58fPLCnz0/bwfhqVjXpLWoRizEoCV9/5sDBEP71wPIhoNwTKKvrSHC1Ym2QjnH/BgArkbhG4gtWeDPDAPyrCasEZ9HJQZFgDlcVj2pZZkavFIuci+ajA0ohZ6Wfvqq4ezl15aHIYI1+LataqezVCBAzL5R19qqzS60XXcbzYcIM93ITo0BMXal3GU8pnF+4qd88HjpI2dqI//GI2xgPngroiMBODEAKDQ9yN23RALuLJJ+sfjfBAAbBHxInfSalKrbBQvgjURHB0eVs772cndu2sOhtbmKrkMlsy6FyBCzLXj5tHobn7lzvaZ5xb2ZH6btq3exeBZASShxwijhH1Kv5JcgiOQXa4/JxRlDy9+ZGSHiGXsiwcJHsQTUnAgap69hH3cQLYyis+EWxkuqF7hxWRY1fUEPOJTJumpGB8pJraBh9z4y4vX+5GFSxQHyqyNPEhQhegQMi9JMMj36w3K43IaltZ5QKeJU2MnW7dV+JDNuJEAHxzgQ70CBo/sPIvnWPshY675GN0AMfrhFT7O4Gxzn++vJ62Jf9DmS3vdKII1VHm4IMV6jwIeHVS5wLyBToEkqjzm03v42NufowjI3vb2L/1L/5WL/9B/6L8w8x5qESx1DSZJSlE6Zl/qGsrE60mkgbPfjYKIPipLJg2NEJlLITpJGkiMqnISSWnpjKnQ3efIi0cRX85NpdYkWTp5OoYl9SqnSpWi8fiCuXumRj+ENAJiLcTslbCPkZBUeJ5LVDEqR0Ci4qdPa8T0xjGLpGShZPiI2/K5mZO8lyJmFnQuniYCWxlDUKIdORKiR0rtM0zhQ7XbQncYRDSqc5nVIZiu3xlUfR+7cEnX6Zw4jXqMOeox8vpiYH+xYnP2yDUP3hrsndf66vWvrpo/+Lv37R/+nTt0/5sXpaNVmQxJ83kVLrrr0FZ31j777EIjHYsf//FrB7/wCzcOf+EXjo5+/ucPll/4wqINEY761VebKkQ3QupVZY6PLS0WFIfRVRXquQp5vV8rWu89uHEEODvzFFKX8PwcA3jMQ8TjcNTajpQWVeCjRKMKMSboYIbeOejHUXgcmZjZAkilYaimqblpND0rRTkAKAi5vJfHyfsU9Tg9hf7ePehCd6rtO++oZHjrLc9vvLHF115b0WuvndHrr5/Dgwe9bDZeX1/yRecV8KFCCnLO1QE8FtrtyossYljQmDMROXHj+MgPw3lYOyjRDgDIa8IyURyxHFcrIFAOTYDninoFnNyDgkIIQqC3uAtrI6QroN0y9FK3OzUMRvoz8xM/cevaz//8rZs//uNHN0Oq3cH167aez2maAwmQJpd267W/ePjQnwQgPnvnne367t1+G76O42qlX8cygVwm4/ytMM+DZgmDkCuiTVVVPQZQ9ovFwtd1jcmgSG0aQkQRhHEcFUTg8SbC7IMG9n70YR0kDACGCGdta50IBHDyEHwxXaO6cgzLLw4Asxo8HtXV+Y3GnMwNDeDTX/3FgWqQcAQiRyBhanobayxQf5KzR6vS+0z0lDwh6RpLNGR6y9PFqXiNbEz+W1KsSFOvdJ2FOfoB+TQIAsazRwQkrfsAAVuiIQaMsWKpwdJBKw0WVEwJazEYA5WChKXWQ1y+5chHqu/wAytwBLGChkY71uM6ajWsvEY9VuOFvxgv3Pl47rbcjSMPMf0qRz38IKPTepBe+gQfvOofyaPVqZz2+rofCXwQ9LvF5tM2uwU+Cnjkblcl7WoDGI79WPB/CwT2trc/bxGQve3t85+vv/VHfzS0ImyZyYpgJeKDJ5MK0cUQqWfSpULKOEpdgCNN4zZBQgkMkC4vHD2qT8XiQpAfECzX+SJeRgYwXztQ9N4H5xGd09cDQeTyR7t8QUqQ/vJW6k8MIwql9H8R5jT/wvs4sJC8h3KNp0aImX5EMKWQscmABbk0V7dClDwAZgFBsnyu/AZQU5rSdPbppWPuagXMGsVREVSVCWIM0rQvripnug5c+rKxAEz/+oiCSJgsNdR6HHwU07Squ3e5Q8Q2AQ/IMEh4DR2ngFrnopBVokHA7JHjcJIe2u5C2vVDbs7vOHPvzcG/8c3N8I0vn/KdNy9kLoTLGzMgQkwj3o1tGmvqOtYN2BDxqEM9R/upTy1mn/rULEz/rqvbt004bgJoWFDQMGbaajZBAfNTzsXIINL3cfo33L8vcnZmxqZZuqpq2CpKGto5GUwjHo5ZIx4w5PHuRoQrRGmIoFT+M5GZTPO+jHJMPJT9Vb6sc/uzahz7qu+3zWazroO0vgQnkQ6Z6CrT0wzet8M4LkbvFx5RP+dGAM699yuvqUDMvhREYRlHj0ilD7SemzKNcvkre876hzKde1oObfSpHiGBFzIyMUkQG0ZREQCDcEZsBkYBjz7IgacRHKEwSE7Zh7CSjO7GYEi5O5q98srBQRgaGJoSmGY+1wJmLKQPQcyMCmd9gI7+/NyP5+euX62cXsA7hbZgV85zEdntklb+amFyoVrJ4UShXKwz/R5mBshrVBDF+VwbIyxwvd7KOPrHfaMmS/HBtt7LMI7Ya5tma+kwRNaGvnehLmVAEcyQnKali3DpmIFEEtZIa+ePv302vPDiUXN/aehizjKmGwRhiiBwboSFoACSZ3uY4E3BKo9eGNgl/havoSJAYB+WLOzUi4iuBQi4TP6eRD9UWJr1kloKdYAeUV/KjIqxsAlCEEB9P8EbZqbg9dGk6x77CFEKFL3rIaZceSuVq/S8IPmHquIKDeYaEOES+Yh1PrHmwzsFkHiOINbIhyoVnAcQCVq7laZdeSVEfTYL525XedYHjz48awzwsT2Ts+1KVuNHUvOBwEHbDB7rrAuwwZfZHlQiHiX6UYrPM5TMYA2vwAB729uf5wjI3vb2n/xP/oZePLepzoOp1DEwE6mf1IhQiYjk49nSHI9pNEQk+iCezt4IKnWX0UNmAFFQYKasy3kal122PKVze0yec//e3YJ3mf6xNb9f3SIxx+MmpbJLEKuMMb6skcgjohTB5Tqdu5yzpGuLlPNj6UalxwSRpkOU832XXb+8Zy6DCZ2DOBMkR0EAsdQEkxpm6Us/ET4K+IyjnhO5XI+NI8s4CgTFyMdmE6MfwTvu1oPX3K3l+X1/fP6uO3702rh892ud+e5XV+bd19eVeNCi8TBZuw1q2gAaqllIfZppQfliUS0+9anDg5//+eOjX/mVo8Of+Znl4rOfbZsQ7dBIBy6XNk6PJLqyBa3akyZ/s/exLS2H98n37jG8+66oZLWyET6qKg2W27ES8Ri8h06lqTuaa+bcWDP7lohba1ELhUt1vxRgeXrtPl7Ae1+FF2q223W72ZzPzs/Pm9VqbYbBoQgU4zIgB640FGar0DE6t3Tezz0AC6LWejxi78+CtnoKnNR5wHSoTBCUH0a14pNDycDNIOQMV6Pluq/doqvGRd+4g00zXtu2/rhr3bVt7Y/6yh+MFS+ckZYJKjZiGYEkKNwQkifRtVp8AUjDAJ97ftF87nPXj3/pl27f/ImfOLr28Y/PFyHaUc1mxlYVmtzr2o2jhJQqXoUp7xdvvdWv33uvH0KUw282HMN4EyjMhrsQUAxTiLUNmqc+a+isRkDqupfDw9Zr62UF12kty04UpIzgIO8ZhmGErhseAx/FcLrWO1zqWsZApPEIoz+DUrpTFMqcnit//0AAzdZ7Omzr1bXK3p15XnGnKUSKIAoQgIKkEY0sW1FVadl2jnhcii5vOi7QJFwhg0n51w5mpaOYohqlrW6JfMRjFO9Tg8ke9QYCChgKSBTfH9haRKxCBwLqsVQXIlBmk+hr5mI+TDVtwqzy4nnwQ6rpcJ1XsOjGjjfDRtfqeT3EaIdGPdzFcOFX48qdDWfudDhVaexD26xpvce00NyXGR8BU8YAHNsTPlk/lIdb7XYlH01gwYGFVUq7mhSb67FS72EUNHZa7bal+DxHQj4JA3wJ9ra3P98Asre9/Q//h1/a/Iv/4n+uEpFapBSdF/CQICxQMoWQcmxSO5ku2qdQkFUeoyqpz8ETMBfw0DWx7ku3KMQoQmRMYOTVY4Ib9QVuimT6//9ct4vIrCrtciGeK8kTEWNQ8B4QE9wgMoioJJ+Xy2cr146YLe9xMrYifR7EJAD1kI8n7z3nbljMSSLjmEBEz0HJsKRgBcV1vr6dDGjeHa6MMDHU8w4DSjq/xLa/qr5nLTtQ8bgeeL565G9evOuun7/pju59Y2ze+PIG33ljS9uNN8aQFtHWbasDA03w1IR1M5vZpq5tNZ/bkEJzvPi1Xzs6+NmfXc4/97lZ9bGPNRSKxrW2AxDx6ad/Xw0gbhhEq+L5/n0X5mFwEPiQ3sQBPjyRhWl9RhYHeWboE3SoxCl4DMPQ9n03936YIXJlrcEqXf3mH0ooVf2SPU/8Y5Wp0njv6nD+tuvWs9XqbH5+ftZeXKztOI7ILLBj/PjhJsTeN6P3B0ELx2wYUaMeZ8z8KIMHo1qGjp0WutNC8PLVTgX3yGZEX/U0zjo7Lra2O1zX3bVN1V1b1d3tjR1udGa80Vl3czB86IgXHhU4pBIECwgmiCQLktRQjK7zzSDh4qCuP/7Zo8Mv/uzNGz/109duhwYE18J0+DYNDUydrBAVMCVENyJ0rMLMk9Vbb3XDw4fOa19o52TyWXAys0QVd49DOAEwIlIAxBKit8YogAwYADoAyFwjZ5LndOC0EHyaa1ryLcdRp3Jupz/AT93kK4MI5InsoqdkFtUEmEq9jOBl+IstGuNDgPH+IcPr5nR74S+G/BBRuKi0ZLuIbEm/IkKinI5FKT3r0udjSWlmOVKG2HBTKylVej9QMizSB08eGfd5gCF48ei9NyICCGhJqM5teCOQ5FQsFF2QzePc45ekFEJ5Lz6Wmo/hplENVee7BB9jgg/1ATp8AJDoA3R4TbN62D8c9XYyngwa+9D0qphypSjDo6LM2AWF+/pzOe/O+TwWml/IxeDB80dUbN7HAnObhwtWqsdONt9EIGnCegofR8G/CiPsbW//tADI3vb267/+X95euyZNmfvhfenqRBFGmEtuPmUgUYGZXO9MUsoF5bJEtbTGLY8pUQMJAu+pAAg7VyIhCMwlusGUIyFY4ED9pO4EIVuBHOYCHyoqURdkjlGQIMFSC5JhBFLko5y/AIhMPsPOnNq4LKERUp9rWNJnESFdcwYRUMsQUiIgokpREA8JDIRL+tdlBy4KAsxzT8haMNPalOlb2rH42Z3T2R46XoK565g3G2a9lg9s4d35xt84fW+8ffq6u/7wO+PRu38yVO9+q4PV+cip2BjLVMQ4dE3XVWV0T/m+Ovwle/GX/7JO/541n/iEzuyooKrw6YfvXQ0g3nuJX5BQ5wH37o2hfmIYX3+dw2wMGB88MH4crSCaq8DDMceIR68aRw6P9SaAxyxAwXKzWS37ft2KeP0sUteNGFPl139ihGMCIiJpuqQ3WpwxDAodm3a9vpivVufziwuNeKz0vtIHemoy9TvmRSrHnNKtvK8ZYBCA8yjv14LIZYQHTus20sFyiQ4MkmADfNXD2HY4zC+oO7qgzfGFWd3YmM2NNW5ubKm/2eF4fUB/zSMvGWXBAK0A1EGVYBAoTgAV8Mixjgx+eZ9/2NFWaI+fa+af+InDWz/98wfP/Pjnlzc+9kpzcPOmbbS2w1pCStlhw3rNoTXuGIBjWL35Ztc/eDB4bcHmPTzGZFqj8qThiZj+0bUgMguqCGC0xmxra3s4OGg4AUhVQGMKHjjZU8F973VKZwfj6K6IeuBTTuFP/7iXy4Zv3TqUtq3COUcFrTIRXVVeW9fUezaHi3ZzRObN2Vn/LX7nXOKHmmkXKasQUVNtK4oQYmJUgazuYwVH9nornbCSx8t0KjXKwwt1m9OrIrIg5fuJiqjUe5SakWDAwCjpnwV59gACxoJthMWGPYGAqhIREhDMk9YlwzTHzFv2MeYZJI6dgocf/RjjFWGd4EOb6I5bvugVxS7caX+q0DGE2/igezDcH++HI6ddeJTWdagUOPSZWiXSr3nd6VRzlQKIgscAg/+Ioh4CBF1psRt0oT4DSJnvoeqir4JqVYaPJt9/Dfr9dPO9/VNXA7K3vf3Vv4ph/IC8PZ+PlhmMc2IBxKgUSpjRIJLu0TnKF/EGvYe2pCmV+vHki3lJF/SI6q1FPVaKtsOaMPE14/deqGN8jkIJkYoYgwEUeIEgLguY1JpAtlJUalItKUmaSwbofSkG1+P6GgDjWIYqeikpZak7lwdjTFS63jWIEcMgnquqUspYeixI8KpYh5FrRzjP2NPjwUusa7bWclV5sNYFIVQVIhEjszCzo/SR9PleyqR1ojypOFgZlg0A4j2p3zHKPn3W1QrcaiXOGAZrmG7jGl6Cd+AZfBNvwRtwrf+2N+5CeNL6Bi/9ZUrIxMyrry5mv/iLh6Gt7iwM4KsLeHzf8JFnY3ilpNNTL6HDFYSLU3n3XTfevw/Ddlv3iLXPKTNQindVIim5nRmdnidI06yqoGYY+qbvt0Fd3fcDIQLrPBDnGk75/J7zRMcoteQhryH/QIh6w+w10mGcU412HHsbACf4QYcXkvduZ6L7U5kAGMfcjswNO2c5TfU8FZGtMI8AwEqiRgQz8YpkshYEhPg1YDOIswMMQaPtuW9HGeqwbzwMLQNXAmKCyhRtKN9eVC9pF7fJDJQhfoAWUEZSxkv1FA4pAvEojCT1smqPX4aj51+Ba88+D0fXb2AADiy1HZAbYY1d5zXaoeAxPHo0KhkDs3yQifeUAYbLXzSuTmMreZyed4JN+a8kkl9XhRFmENMmr9WkHFcCb5oKZrMW1uvuaaIe71srEgZjyq1bN1kE8fj4AXzzm+/B+XmPiCCps1j5sIDb0R+8eb596XljPr6s6j+eOzn1p9uZzCod1UeCemMEFELSqMhlAhUYKrARsTl+aCEv3gdh9ooSCg0ukSSNDhwKiI/npMs811LvgZAhBSiV+Uj6aI4dBumaSMhIHsiqQkCC1OQktwtBGGDIZR0iPfe+o46D14nlsSbEoCn5fcg5McuxkzxU0IXH+Qt34Va8cuf+fFjLeuih5/KclPfkmCHWz3gPnsNjxuB3i8s/wpSr3OHK5C5X6hNwbPP8j/6y5iOo3ul0xdDDc8Cwt7390wgge9vbpz+Nm9Cw523m0TrHVU6zMiKGRDz2Peb0LNFjUC5unSvhDon35eb2QaV7lg/Ly+ngRCwipTduXJfaUFCf5makTlLekzhnOKVgGdFX/F7YKZEKyAXvgNkkTwoPAlVZo0IKc3nvkGe0TTtXpfeVpoZfpgRZW9LCKChBhQhEeEhRGwL1IsTeQxByScFSS4X2HDzpGoPHPE/N1zUgYkrDIgLP7EkE9TxojASZXCBvSq1nBB8R9N5fDR5Ty3U3wE7kOm/k0/AWfoJek+fhW3AMbwhCD3LFdGuMusKIwITWuvb552313HPVB4aPDBxeP3DXid9uWSeA+1Bc7u/fH/nu3YHffXeAkP8/rtc4tO2yWy6bsa6rMkhGTQBKZyyO0BEWNkOBgket0BF8pbUXzOUHDWm77QiRyAerql6J0CMaLmGtSUgGmYWCDxoVOmgckw+yYY3OeZxeID8ZPgo4FU+euRoVPrw3LNFWhLgFABfJ3RjI5C2S04Egh9gcoR3E150fqi2EjytdPXJXDdy1nvtKwFfweNsN7BUQKVZwxEiqfzLK7mExCoIjoNHMnjfLmy+5688G3XqWlweHUutojVzTEQy9czxcXPAmzOgYTk/deHExyjAIPJ3JVe+4zCYREeZ8TK6OmHhE9FKAJKdsofeeRLg8T4UT4IiW15ypJ6brtW0dU6ic8983fCAiWGtkPteW0TNq2wZnsyZAyLtw9+4KRVIrwNzKLxjYt083z7x10H7yRms/2S7m3yAdE5pmWDDWlYhwhJDEZZ5SI3SwaKGiCtVShJhJH8vI6MSRioQ8CiJSfLEyd13hJP1lBJCBSmtDxPKrJqdbcXARKNiz7oGZEQRUsdZDj+ljc/oVlWYkSBiBABD4zJ+NIOAaargNt9rXCh6shoJxyKB+IvV6u+CLYeVXse/VqZx2G9hoRysWlMTj4VZMIB7DsoaP3iR1uZrAhw0+aZMiIrnAXGWCStSjyceqONm8h5eCEAT2trd/mgFkb3t74QU8D5GQd8bR1bneIkIHszEAnFvZUhAjMwUB5gv5FkDsZSbzCPmxuVacy4VE7mpJcaRDSrmCIM6PIZCEGbl+wmQuYE9kMWUplFOpoBSnS4IPD0SYIysMqgwYOVVeVZovUW69HyEneJb0XKR0jevzdV98DJQoC2KhnAQ3xlAenghQUsicI13zNHCQIjBGUnthygBi1EcI0df3PgKWvi4l8BASKfUuNvhyTUcY69QNCLNQrqVheIwhEoJ4uQ09/gS9i5+G78Dz8HU4hDcAFRCvhg/Ex58QpesiMbm+Z1vX+uGufrikNDPxXuI3ve9FoSNGOhQ6zs68D/n+HCIe7s03+wAdXYh+9KATEolQwhBAaZp0YegcZ0BIPzTes4JA5ZymQg2VDhFU8BgG9aMCxrQfNJXP1HWjjOOFqaqtwodoWIqIpBRv51yw4FWsUQ1Mr+VLx4XHfdYPEPlA5VfHXI/MJnhhkQ4Qe4M4lhKREu3Jl4XGA9gRoBnE1R27pneBs3isRx5qL6Px4EgQiFGp2wIIBwk8vZXMPrniaJKYucwOX3TXnv24v/nsi8ONGzd9O9N67gpKTQqk4YDSnZ6O65BGN5ydKXSwHv8AJvAYQ4Xg9HVBvroeQ01KaBMmvcDLABxU0tdnTmtLEKecMJ2SiqI/K3Wt0T4LzvEHBo9iiKgzRsSY2HeWDw60DdgzGmEJ538H33zzVLyXyeMBu9Ev377oXn7+YPZjx9dn35lvNoQx+uABxAOKRA9ACLE8nA0aNnFJENaAgMSY4pwRLgR9SegDvTGgoIzAZe66npUdIJb6Dg5KQUe+BNV4nAU9exWoVwBS+BAWFYa1QUGbE7zK8wAi3XCMUmiqlIJFA42IE0216nUex4pXQ4yewZjOnqMXur9qRoce2bXyGALFMkP6ervPy9Ec+ZDowbGFrsmRDpXNa4UKk+FDfZnvYTN4qCis58EfBP/cvt5jb3+BAGRve/vUp+Dktdf8/MEDsbMZGYUQ5tK6FqMHIHSOcz2HKZGQNheqT0oq9fnqPWRYyX+9pyiNQHgPnCCk/MHZBE+lEF0hhIki5PhJNyqvi+TKmAE/aQBEIIKqSWfOMvwadS1q3kspGAdjjL5GMOGcNkbMCjaMJoc7RCBDSMny0j0FiUKIJAiJHscxv+4kbSSdCyVBS4EQotTVFknnqSHGr6U3sacNGGaRPBuOU22InUCN1fMZEfR5mKFclRWCIHiMA34O78inAny8JF+BJbwp0+s7zN7kLcL7mPfiX3ttu/3qV2vnHNhbt4yZzw3WNSLRZcTD+1gBz8MgvN2KX6+ZVyuFDichzYofPXKhq9Wg6VZh34MWHU+NGTS9qd6GJzNLZa0theIKA5ijEEbl/Rge64iZIdkueEwt1W+oAPr8sIlNAhRX2IeBj1yrYr1IPYoYThe9AxH1SDRiOpWUHswMYByCHRDaQXzbsW8GH4BDfO3FGyYgBoXiGilsgA0wj4BIkNLuERj6qyEECRAtANWAZgZkW6CqDes6rKt4DmGfRsMNWyFjxtnBje7a7Rf627ef78OAPV9pGU0OMyKANg3Q2g6/CVDZhRQrv1o5cR94irQ8BSaVjnFA3j82CpLhw2MGOslDGTVyRd6ncADRJSPspF9BjoDgZRTEgo3JpMP3BR+lpYUxKS+0AMl83sJzz93AcO74Oq+//iiHigHzD0T15sn69nN19cmbFX2sbdsVKRDnCCeACzKpbWCM+uQ5HiqLhGEBCCSECgYoyMRkgAAzIEQyMGLCSl/zck6MxNhpGu8hggmVQRgEyoU9ekngEUSR0QVsOEbMpeGXEEF8D2Xiuk/xbpQyfFD3+toddr6XvjuX8+0a1uOAsWNVAYaroxgIj7UKKjPDmV3gota1RUtlnjoBwdv89vltvL3QvdaDjDB6+P5sjHUdu1GPknJFZbZH9H08Vud9kyMhFHQLBrj2Fww+9rYHkL3tLQ2jlnedG+zFhRAzUSoCRzPpikWIhCmTQUCNmcE5aCbjCzJoIClUiDCmtG3C1OTHCLN6EO9LWpQEUw85kpDgw3uA722PiybVVzhd5+nmolIoiRGGBD40aZOrZnKtLJbaYigX+M5hSULgRCiORTh4L8EUQi6j66QeUTeIVOq1McMIWisRKsYRGC4tR01Q8mNFAaTUgDQNGSLGYVD4MFSCBuMoPr9XMqYMozaIqGufUci87/+Fa/DwSXkAn4Q34IUAHwt4iwFk+ownRz12oxr373fb3/5t6b/97S0991xjDg+Nfggguvxr8jjG6nfpOpFAVyoIaTh8fu5wu3XQ96ww8z4XmTrAZGzH8dxW1YZL9pFIiUyw+p3rTsSSaqWb7/OC90PBBxHAbGagrg0YE7/BkuY+KPNUXge/6Nek7zsQGVDEFaqVII8a5ZBmAGgidIhvnFfgkIoBKF3sExqyYISBVeyDLLAfwSMB5z4SzBDJX0ChpEqg0RyDnR+BaRZQzZdQtXOo6hZsXYMxZRKnKZXejCJjRbid1023mC/GWTtjW1WC2YRZxs1GNgEotwEmQ5qVRphytOMHCx5TwwQfYB4fBSkFzp4RZXoQxlEBdow/R0RGjxVNQUS9WlynOSb6fa2+X/goP6GSh2bA1DS965lnjvMvFIJvfeu+ZBAPJjA6XsZakKb53HFV/YNl14805ugHqLgUdBsipiSfi8Ul12AQCqZoBwnoIwya9DMkLhWcgd5KshoDAemahfK5gRgFUDIte/AIUlgfzCT1CkXE5EntpmTOIaBwPJ0uAXQdFJ9tUiG8GDI0s22NHkl7YFmxzMheRw6WlC9AuNJK3NmAwUM8bILaFlttT2xqqiuDhlLAh8Wz52t0bREL1aUbFaMC+GTYySZPAB0BUXiYpFxtrk65yt5AD436SeQDw/o46F6ED4a97W3fBWtvfxHtS1/6kvwH/4P/5e1sJjWz2Pz/bpx2ssqRB0oe1UPpkiWSIhEZAqDAiIgB7w0zG/aegkyu8yAOgokXABXCpBsmXdZpqNJ6OoG8KAMQ5vOrQOWcAWZT4EfyPLbcrQqCdJ2ef3m9wqpy4gISkyhPeg+5DiT7dFyhZqejZ0KkCFwenItZRMF7CeL12nkFEJFY+1HGgqDIpB588gbKBHnvjXq+fIvThcAr/Eg+J6/BqwE+rsO3GMFDeRBNhE+6Xp8UqUcq2mxGH6ZRu9de24zf+lYYWviNzfC1r62Hr389avzKV9bua19b+W99ay1vvLHRmg45OUnwMY5PTMcuxUQSDJ3zKlJ574nZ484wiAIdJnuEH4IdHFR061aLoSjffO5zS/PTP31kf+EXjs0Xv3hEP/Mzh+bnfu4If/qnD+Enf/JQPv/5A/7sZxc+DGrkl182cHxM0nWOuw5GkHqLPF+DPzwXd/2Cx6N1UC9+6QEbMFQRxTnWeea1AYoiQBWaoB3sCmu0bQSO+vAlmD3zKTh46XNw+MIn4fDZUDD+zItwcOM2LI+uw/zgCGYBRtrZHJp2JrOm4cV83h8vD1Y3j47Prx8dbw+XBzpoXjQAoKa1HV2IZp2F1rnn3/1ut7lzp9eIR/wBF/ko4WM3lU2i7X7PUwKoCb4F5jmlqeRdFRS8hxB1kLZtpKqqKyIn2eH02jNF3rquQy1E/4DgUQyNMXx0tHSLxYLDGkp/7QQ4RG1b0XzeCLOXk5MNMJfkSzDrwdOcaX3D4TeXW+exxRnN9OI6dbkq08upIl2rkBByxyvBy2tmFGHIN5ToBbxwkEeBeIRYGGQyO1+PRkMsrJI6JQoTgzdeOLXZBbYiQvkcle51nQcXSlDKekRQgPEMnECJMEMwgUYqWmqq8PmaBS6rBYbPCY3VcYOpafbjAeQAD+rbdPvgurm+OKCDdmmW7dIu25mZNS21tqIUCckF+yoshetayM7CTxdlEeAMGufZ73S5ym10bfZV9OvSZjfK5AnnOlzwhX29x97+gkdA9ra3L34R+y9/Wd7Szlg5LZ4uB/AJYTCYjKPw3kJOtRIRaEXIMiOKsAIAWyvovZRhuSJSLthVKM5hacUbY/HlYj0VoYOav2w9Sqo8Hdzlmg2WAgoihMyqeF7wPkJCfk0sxdsKRKIPJ4rHI6hgtJRKdVns7vTckA3ViCJwIQCB7vK1gzEGQWWtRKXPk05kjMJQSsMiKvUfyMGjDhTXlLeu83pd5/teXErGEEaMX7sStSAR4HTd5fP79mFtc40twtSO/Jpfcu/Ac/AduEbfAoTxqiLz7J4MHypOu/T0HEaCVJSrurKYXR3uDv1+MnwIw5VPms6GkLj4YUHH4WFFR0eVCVEf+/GPt+bZZ2s8PrYUIkAwm5FOfGci5ES2KbEkt11ToXOICl/bbevOzxfDSy8enP3//rVh8/Z3yYE0DFADqaUezAYTYFD+dJi/igKXrYtRgtBDgXNUMGnngO0CzOIAquUh1AEs6nam2UPlYjT4dD667DXNlTFjUN9auw1+CGIkEizhO2YZuo63jx75bWib25+eXl3b8RHDh+wUpBtEELVdCEgF6C54ByIGy/M0AqJd0cZxxEZDd0AMcBn1mNaDZM/plwWpsDzug8DH9DGIqNpty4wAsT4Eb906Mnmkurz22kMILj7eixy+3Q8f+5irPnedqj+Ynw9HcuRGGa0Rw1as9+C8A0ep3oHynA0EQdBD6ZIZJe0FsOSo5sflf+Bc3pmukUW8kFx2eU6haAZJARNCJMfpl29wJsGNkBdPABBBRB8mCXUEEUHPmqvsKQ9atyaeKSzQQIWVQQZ97TRXPdiCnV/4RX3iTzaP5NEWdqzF1h7jcRs0n9NcYaOqqVYpcJgClAws4eadOI+cO70TwAmfdF48P1V6F8I4nWhe0q4yeJQuV32u/VCfOlxNU65s0CzoVXCwt73tIyB721uyf+Vf+ZL7L/wXfmNwTqz3YHM9LEE0VOVrl8kU8nSMmIFEEJNoChzee4xRD+9JisaxREPSY5NhiWzkHUoqVE9+ZwhghgwDzHouy0ERYMp5s/dB6pn5MvoBQKpS06omO/PcsmA69y1fq1BSjoSU1K8SKUqN9kGFO4P24nDnYfDqpesUPHww4CCf5oLFDzqdIg9BOW0snqYMb8TyNcoeKx7lpeEd+uT4dXgF/gQW5kRMgYLpF/cp0ki46EkdnrLMNLKS9bTgUXLmroIPBJAroh0fLXwsl9Z86lMH7S/90vH8r/2140XQ7Fd+5aD5whfm1auvttXzz9fm+vUKFwtNz4kFPpFCp+19szhfyHpEdFVlOmOr03ffnm3efX0GiDWZKk2dthXEFCtjwaoPikBCl0CCQTlMFtdgLFAADXt8A5pbz8Ps9nOwuH4T5geHGtWAKp4rnUNFiBIE1hg/s3azbJpz1aKuN3VVucpaQRtfF9l7CdEOf/7uu+NZqP/RaIe7uBhztAP/LOCjQE/5oVeTHQjIleQNMLexGZ0xvSXaEqLDqjIym9VaWC7GmKsJF8t5SgTEGe2itlptd2Ej759oEWIOD+d+Pp9LTv/aHYCI1hpoW6tdt2Cz2crFxVBCodSDwIHQxQ2gby28MzivaqqMJVvGmeeoB0JCDMyF9Cq9xUgHMnhVhFkWRi+6F/Tgwzq102XxZdiMekRIcThMcTdLSBYETar/k6gY9cg+t33WNaYAFAEa9MELEKR+iMRCqQ4vyKI+yJoqD0tMM9jV616hpKHGttjWGuXwkorSCQjnOK+exWcPrtP1pUY8VDM7q1vT1uE5pqIqDm0sEY+c7lUK7CEWpgezYLG07r0SRFJe2hZK1MPkyEeV9zbet8l+DfUk+lGGC5p8P0MHn4HdmpO97W0fAdnb3p57Ds9EZPOVr4y43bKUDlOIAjkSoB5KZMJ7DjI5KoI1M9o0s42ACIToshZUhKCAifcYRHzZdObyeiIc1yO5Ba/X52CZNC4SxZIKHoOE00VZjIKA91GYvSQhq1L6luT3LxIERCW9C8i53cHdnIGLISh4n+tMfG4TXOpxBdRbi7kbmJo6XSN6r5EP8sagWKuiWMzetiYYElFq2L9e8xA8ti2KMeytJRM8IXqEZJJdfu8MxnhANGAQ4GZ3z9xYv1Zfkz/17fK9wQDKToH5B496TO3J0Y4PZBk+il09k+SHFenQkNTzz8/qL3xhWX/yk03zyiuNDcP0zHJpoKpwWkiUuyhcyW5PaEWsc0+Iu20CDZOhI9dgmKApbODkqzGNgHhjAasEHzBfgJnNIAJMjnIU4aVXEOXK2qExZttY24W1i0VICXBQTQB0gryEaIfbhGYBvc7t6HsuH+aHCR4CO8a825YXJEWcdh8vpRA950xe/pxtNj113UCLxShWaSvYtAakeESg/DwulWgfHDymj1dNYRpkGhxRjwgamQk1Idfoc5/TKNMbcu/eCpgRB5Gjd4g/9nGmT9yw1Wt21c0hYCOMxqHxFgy6IEKadOG2wbPJcyRFkIVVIBg8CgmC6B1iLlvWpgEdoGiLMRBOejjFfin4SccwANRjmIr2UPQGQRL/y148KEDkxC+neENIkV7zkyOdqCc0YpVpEKnk8pkUa2YJ5plZYaLltlIQGSRNOl/ispnRrG4wAAq1TWMakyfBG0MJOjBHyrx48uCZUmAfBeIxe2gO2worct7xmZz1CiI7VOojVBi4AAo+rdcFPHK9R1KV06uquO81zUp9Ohb06Sc1Mtjb3vYRkL3ta0L4P/Qf+g1vjFjEGNmYzgMDRMAcRi9ZBKjHpxPIS71CihIkTSIgnCIS0+gHYLDsqNSScHoNM4EYzPdRWBgOEuYods5KqQNRH/acIy+qSdSDOHsPUF5DBbvTxgtoJQfldUmCKH82DMoRiyjKQ4TVchpb6fIqMQISJOOY1PfsnZNgCLmOxHtfaj1S4CT48FjgEgUpM/OSZ1Adj+fmudVrs2fOfq+9wX9M12Yy1tYKfoDi2SfAx1WRDsR8/EPCBxTQ2NFHDh94dFTXP/mTB4u//tevH/5b/i3XDn/5l5fN5z43t888o3n5JlIlUUlFfKrp7rvy3oMbR9jevQvnf/wHMPzJ74MVAWOqIFtgJMhGGVKZDCaqAiVGQQlgeQh4fA3o8AjsTNOsKrD6mKBptMMixhSrRVWtc6TjYl7XfVVVbHLnBFQSDtYF+j19770htMTr1m+91bnzcyfeyw8bPuQxF++7VqIgUTtAgCJVnoZeG8ShNmZriNK/prrWSEMTfGr7VQxxNxISTxwHUIaIBF5cbHQf9UENEWGxaL22mM6d3WDyOgWDSiRE2/PGvM2HDy8kt/81W2C8buz5rdq8uUA2VJM18UIb0eRSb0IsQWI1mdwYGAXVe1TIiDUc4jF78JKiIJwnlmMK4pbC+RThECEBJgjywPpYkiCGsNO95AmJoKvczhzFA4FDQg5rURESG0MpyoeUI35hRSbF9vItmB4rtS4KFKTRkIVZtMcmpFyZeaNpV7HOw7Q2pl6ZeKsqU2ndR4IQwGSAhf7Kr9C4VJjRonQHTlTT2R4a9ci6iKpSvcck4pFrPiYTzZugWVhXeb7HteBf2Xe52ts+ArK3vT3toMJHX/uaSFWNtFgwAFBJ6S91IJQiA2oiqY6CJF10UR1cBSCTonJUyQRMdL97PYEFBoLny2gIC0ABIQyeMngwep9rchFzdAVRlQCE8nuiDBhqyBKMuXTEwpxtEe92QeZySDaWMof4GGOQAOJrUCoCF0KMKAJBYoyU+XF5nAgyBmOmXCdCpqoMBLG1hqvKUpAhAp9mkIAwg2iNstaFpOgIkrXp0iK9lo/XKKlxjnqDS/T2Rn+nvnbx9Vn96A9mw9HdbuDnuoWIB8QP1Lknh6Rwt2PWJMpRvJp8WPAohrtJDx+1ta0J4HE4/+IXl7Mf+7HWvvhiE44RfJ82/TLuAonrOli/9Sac/sHvw+af/H2gYUjgQRk4olIEhHINCAJenqtcOFUVyGIB0raAYZ0uESl5APUqtkSutbZrq6qrNQXJmBQlVBlTIiPkmWVzeupOwyDI1d27saDcAmAVBERT4sKPGjw+EHxMoiAqzp0byiNzgYzLrZmRLyepMq5WHR0cbKVta24aQ4hYfu5Bl/k82aNMTDfwfRimloGpkcIVP+SSX1sNM6zQSy/dlM2mkz/8w7eFWWhAuP4O8SufrOxz16vqAQ5ugGGssFJUjdGF/Ld9IygClxf7YUkAkArtGDkhAjB79BR8iV6oFDAEEPQ4UDoJJfrEXL8B0798SB4qIuUM4caMDHGBYYnxeT5IMlgIZswwuiPDlxG/jAnBRDLNQOahnDoFdNkg0YI1BlKkIxeYW0vxZvQYUjwPA4GApIgYC5euX6UQnVQ5CiRRCApNm1znkTpbmQIdup7Uc5jSWleBQ4ElqA3HKEdC3H6q+d72EZC97e0D27/8L3+p+0/+J3+DEcWki3QV5/pUkeCDhAAEC5VM5nGUSEjwBCV1KtdMFODAyyhD8ZjPC9kQy7y4SYgkHy91GDTpdlWiIFT2zEw+n0lyKhcnwKFp3ekkNZt0WdYYLHoRo4IkQoDoFbhKITzlNLWg5FNBv4DKexbnJEc/RIZB4py+4H2OrBRQw1SgL2UeH4e1T5EU5iD1ombE4zPDaf3i5lvza2e/u7An/2AJ5Hm2XPp503iDyE9dOJs4EqfRB1U+JvghoxHy5KcL/BDMvPLK4uDf9m+7efRv+jcdzX7qpxb0zDM1WItPBIwdXwBj15eox9j3sL5/Dx78yR/Bw7/327D9vX8AZuhTtMNW3xv5oAwiOeIBO/UI3Lbgl0vg2QyoiulWSYhgEbk2ZphZuz0IUY6jtj1fNM0mAIiLcxcVVoxBYy1GKmaG1empv/Otb3UPvvnN1Sp0K9P2yQoeNjV+mIIH/jAjHhPweHrwK9BQLNUm1MDcGiJvjekMYo8JBkQJXiMgElRyMK+IhKQIyDCMdrVa43q9zQDy/VnTVHxwsGCtP0HE3ShIsXIBjlVlTZAMwyAnJ1sQAXIi/ExTndxu7f2WBA1hbKEcwwel6S5CCR+KCqQABvgU8QAPjJ4dePbgxEO4icu3cCTCQlaOn5RhStmXc0o6LyPrOXQFPn6BhQXEM7JDTN2vCImtAjcGaW2Hylx28tIbpZuuSX25ZdN1/FdSUWU11aoUm+e1TeetTIEQyiGhbFIMEJAl3UYY3cCDX8mqVzFyinqYHPHQdR1UlWJzjXpkxWhHHjio61mGEYWXeVh/OuhfAYG97W0PIHvb2we3/+H/8Eub/8h/5DeYSGwqsC4REMp1IQUICpAUUJActaCd+meKu7TB94EPXUJ5PcrCpAQfQcVDLkafpnux9zauRUpUBUttCWCunQeQSXMazOdCKOvLY0Z9hg6DJQ2sCCAqv7/oy4Uc5PkpklKwgJ3jMq9Pui5CiM+vWc4jCVxAvPfMrHIs4nMH0nSxKyxw7Lf21f7Nxa31nyzmZ/9ogf17tdtuUYzxxlo/q+tYAPqU8DHNU58K4cOCx/cJH8JpsjcH03VUJl3M5PhBrPrpnz4+/vVfv7n81V9d6jwTqKpygg8MH7vgUTR0HZyHdKv3/ugP4M5v/204/ft/G/zr31RQyGlXGT7sFD4M2FwDshsKkqoCP5+DD/ARi8T1PAodRKMWkx82zXnQRYSOuh4qa9no4xQ4bDq3rj2zXIRuVne/853u7je+sd6G2S48jpK7SmGlkJJp/6OOekj2HwY+ym8engxzLL9YFD5ApCEAsER9RTQAXBbSYF1bqaoqTjlHxCtb8iqAjOMQAGRD2oZXRL7v0JiS4HI5k7Ztd4voy2uqMK+RKIZL0Rjii4s1bDYjOQE6sHb1/Ly6d9iQtxUmCMnNCQhBSs8OTGcpdRksHOTFKXgE74HBsd5G3Sl8ZBxhFsiREyy/GCWDB2C+UZmdznB586nU3St8ePIjIDgiYotWKgo3rEBBozIV1KRl4jXqcYs2wkUWqlFCZj0CBAlKjBiFC61PSbUemIGjFKynQnar62g5qnJZFyNqpf7DDzy4kVP61UN5eN5RdwEmQ4fNvop+HbSZStOsJusu7k0uPF8E//F9ytXe9gCyt719aPsf/Y++tPkv/Zd+Q+tTLRFiblOf4vMEfBnMkAIPOUWrdLmkMqB6OlYjQwBKOva98EEUZdJ8DNUURMof6EuPX4JLGVHwyDDCItPzQlwDXBahl85WBTry/ZiO6/nVF8ixUxgpdSiY1+qRCAuElJSvfN0s7JyUYeFa+yHDEL0PCoY7TX1SdrKIC+IoZhbvWcr9FXj8ODxaPN9/Y3G4+v0Fbb42h6FHZLau65BTnpY0ekFKxI8Djx04wKl+COBx+blTwYu4ceSh77nvOtdtNm67XqtGXXfbrdO2sMM4On85fwKpDI57HzOf+MTy+J/5Z27OvvjFBWgHq6e2q+FjWpDunIPt6gIevvEGvP17vwOv/Z9+Ex799v8L+m/+MeB2AzaDh53WfWQZY9Rfwvj0dRETgDSNYFWJtsqdB+g4quvzw7ZV8FgrdOj1rc0drDJ4oMlr7z1m8NiGiMd6fe9eHwcHZjNEVCWoofza+KMMHsXw8edDEKkUQiiBVWeJBiz3ec8x8lFVpBASIyKIOP3gpdDNdl1vLi5WuNn0HyYvD8NSAYR1Fokx5qr+1LvRYKRgxujsmIHv3bsABjHIODy/qO/fbMyqSb2iyCi4IuaAMAimeftRCAgZDhznKIf4vHLs0xH2KmDOqMLTYUYTCMEMN8wKG1DwRiCeE5wTBMfIQX4UAoUPbLHVgYBoyUbgCGv1BT5Ib+pzSpR6ynVPYZWOqUxKWqQKbOlwZSyaCCCGks9rTJwUnZqo+TTNCPRzj5wiHz33w0pWZyd0cs8ZdzYBj/PSYjeDhapEPro812MDJerRhvVh8J+Abj9Y8Adoe9sDyN729t/+b39p+5/6T/3G1ntpiLgM940QEowBRHSbqtWFS7pT8uXCH2ky1E8NroYPpgIfqrA3YW/DOvhpNKREQUr6khH1zKkrVxHidMDh1KtkZ9Ah4hRCSjrWJXSYIILddCxVtniuolLXoeCRiskVPFSe+975rnN+u/UcLEc2XPAjAHgBYJjWqpbKyfhQz/CJZjv/zMF7R7fgm8vm4g8XsH5kjPcQP733Vb9a2UGEHACSMWKDKJ/sKXL75YcBHl6hahx11oTbBsBYn5/360ePuo3qwYPt9t69TXf//qYPvg/H+pOTrj8764cAJeMweMcspXiIgr0fg8z+5t+8cfiX//LBB4GPq9KsyjoQOWwvzuHR22/Du1/+E3jtt/41eP3/8ptw///zv4Xhu78LoN2uSIGjTvAxAQ9T1pT2hHTV11GIyFPTDLPFYnM4m50fh2jHQV1vSjF5jnBQAY+8hzJG/+L0NILH3a997WJz//7Aw8AwsRj5IEJLwaDYDxk+mOHDgq6ofS88VCLSkgjlCEiP0+no4+hLYRbYSGs0gRBdqtgy92YcO5QSHJAPBB7TQ6gtgEN9h5Li+/37wMkkVmJmDBDEjx6tpO899SJyu67OnpvbB8ua0KZLbjSEaimEWRAE1FLEQ1EDnPoID+q9xJiFcIqAOA8KEd7nWF6k+7jOMRQPXs/NpTs455sT5x34UZCdj9I1eI18KGyocgREhSVVqp4MB0y4QSkZi4LAIGaMMHpfrpJS2ZhMmPA9HKEMHjRN5QIEKGJg1s+WIz1e4SNoHGXsBhweneDJe+fm/JEYuQQPVZULzdWb4Et73SarzrM/dH09+BdggC+BwA/W9ra3PYDsbW///f/+l4bQHWttLVTGMAGAlIt7IvSIMpksDp4IyuTx8jhOReSoVuBAVCWlS8EjiSmvyRiFEY5rotwciDCozNxQlZSB8t/iAXeL3KezTC5hpNSmkCTQKOCBMN1PIy1lDkk+JgDTuSUo+f/cuXsVB0mQV/gI4DH4vh+j324Hx6zg4fKARVAPU/Ao63IxMwemn7x+eu2V+dvLY/jmAZy9WePFBVKZeZYiCnZYrZpt35vBe8MAVL6o9OHB40PVeTjnpA/ktbm4GEMhdL968KBbv/vuqr97dzME8HBnZwOHqIdedCm1RYLL7cP0mN7nV6vRj6MXonQBXiZDPsaqMJm8+exnZzSb0QeFD+89eOegX6/h4sF9ePDd1+DtP/x9+O7f+dvw+v/r/wrv/j//d3D+O/8XGO9+A2BcAZKCwGwCIBbI6NpMIyA59coWKFSTcNCbquqb5fJidnx8vjw+vljM55sY6aiqFOmwlkz+zJT2YHLkAwBwu1rxewk8Vuu7d1PEY8cIES1RlPn+o13yw4x6wBXzPzAfYhFB3abDJvgGRawlGnUeCE7roVJI0gsRYoYQ9TifI167BvTssxCGT4J58UVDoS2zfOYzB/LqqwfwzDMzqGuLfR8H+jxtfRXqcWNMAJCZNE0jT4jWFQgi57zOIZGzszVvtw5GZlqg2T6/qO5fb4yrFR0NRcuVZym6wiWjEiSPMPXgOHfAgugV/tPNZwDxDkY3RjqL4UWfgIP1LKUGnQWDA2BdM7BCi3PgInxwEBI4Q0YqqqCmmGxFwRtFkTzbI0c8IohQLiQv8AEx5qECTCAiRDkNS30GkVjjQaUQPaxVkKlFLaVagfdB6jlIP6dqcOAuRhofdNg9eIgP7/emP1X4ECtXpFxlyKiScvpVFwFkGfaL4J/7SAcL7m1vewDZ297+1t/60vgv/Au/sW1bKPXNUprmqDcGPCKyMciIEESlENEXGFGV+AOR0XXeMaUoh1BS2qdjoNI9qc/7CYhAApECHZlELq/H1VCyB8zLaQlKWhSYUCPVdPjgFDqyR2E2Mu3wleGDi0/dtpjHMcIHD8PICh9BrPChURARlgwaZQAhXl5nwU52iMCnF93Bj127f/Ssef2gWr/eurt3CLbbQlvlweqJu64OEYOq6zrbO2dH5kiEJbctP1Y+4nQrEWbQ9CqNdIQi6G4VYGPz3nvrPsiFyEaEDe8FntaYJV6UNQ1RXVtbVWSMeWwUxGta2nJZ6+OBCAVzzxt1XKIcHlw/wNh30K9XsD07hdN33ob73/k2vBuKyd/4+38XXv/b/2948//1f4K7v/V/g7M/+NswvPWnwJv7IOKhGGENZJoEHUFEVS4wj/Axnf0hZEiQjDNNs6nn84vm4OB0dnSkflvPZqOta8kpVRB9EOX1FDwIEYeuk/tvvDHc+cpX1hdvv70tEY8r4WNa9/FDAY8PDx8FPHYjBlzuzy6HJtugyhI5BRBC9FNQEOc8B4F2w7pxowrNCSrz8Y+j/djHIAybBHv7NtKtWxSmlNdBDT77bAsvvzxXKYgosMjp6YDTdsXvxxMiDJqCNZs1EUbKwxFBYMfKIETvvV2v1xTqUHwOnZIy+YuL5uHt1pzNLF1G/yiVcKWpH/kXHotIiWV4YEnQoZ5z6pUT77w4hQiNCsTuWgoVgCAltRZKZBdBCnh48V6fNyZ4cYIcJCMHGTRsyUocCIgVKojktCkq7XGDTxieu1aVWxm2mX/Fq5AkCMiQ6D5hismeAAlzrUhGrtRsGMrncypdx0k8QnLu0T8acHi4pvXDC3Nx31f+nC2vxMhl1MNOhgkW8JjlFKw2rtfwcRjgEDzsbW/7Nrx729sPpUXv+stfljeXS+mJeCRyru9pBBDnnIQ9aO+W3hgZiGRhDIbjOOjeORi8xxkzVMxUi4C97K4lFARBpQaEdB1kjIl7g4hQVK6bUlvevCJA5hSBiccuh5FTEE86XuXnCwaTSbRBVwUquHT1KicxRiQ4yek+nCM7YV3A5nJeSfkjepAwl7UEsZSyWcTSRrgIJX3+AiFp0KE+vzx+DmJePlgvrlcPZs14txlO7pNst5cXdPmBE0MZhrZ/+LAdwgXTKlzYtoeH/XK57BaLxdg2zdhqsToif/iBglejxzhqMKP33Wo1dCGVagwpVewcgwh8WJNAcPI+xfWCqCL/xhvdo//N//ohv/KxuXvxhaU/Omp01oepKlCLgwL7DrrTE3DrNbhuC5s770D/6D4Mj+7BePYA/PYM/NiliznvANg9qSYhH5Ry050ChzdaMN60va2b4JveVJUjawWNgQwYlPstR/hAY4jSHoKHvEYk0roZOHvwYLz/7W9vtqHGg71nUHsCfNCHh48fDng8IcJAOQ8UisUtuBwZoSA0V4ApLhZkPvOZxnz+8woZSFroT7QLD6mEuWl0afjoyAYAaQKIzPCll+bwO7/zEO7f3z4WPrIpPOg8EdJuWNZW0xbA05+d6UDE8nNt6trUBwdV1/fOrHq+dmfrbl0sq3eOKvREqE9izMVmZfKHsEdGTBwCKCzI4nMCFRBLqg1J4jSpiIRJTD6D5IJ0a1GfDowoiMHrcQUXzyVtC9nn2o9BEDypYbx5izFawQaNz3EOE45B8BIUVrakj0mOrkSYEApLvozjlJoOCjcUxBLcloxGjCxqwXvP4QZJGT4GQVkj4jkAnIb1QyZ+yMAPDJoza+wm7LdgoPPkU0tdE1SiHU2Q7is9FnQQjj8LGdJ+aLa3ve0BZG97+/zncSsib737bj8SWWetjMbI2HWi6wgb46gQgn2CEZg7h/PgZ5rJ4j01zNgGNSJSp3R0mBRvoAoSgID6UohelB+aUuXDulzol7kkqZQSgb2PD+R8PZozNUgSLPBOa/5yYhOhhSglQQPkE0uCA4UZIirQwCXyUt6T2mUBOrCqdMIqQHIZjVEjIGIQgQIhpQ6WIVneg7zQDO2z9cls4e82sL5X+YtzlHEEhKsNsyD19K0DhNTD2Rmvm6avF4vt7PBQawyG+Xw+zBcLV2ttAQCj9/xh062896xF4xsFj4cPt0O4UOO+9/ADNB3cZnL6Vbl4FBEUIhOEjIADCnXcV6t3vl2v3/iTqpORHCFgvOCvEITzReI2Q4WAHmOWIB/E6vVYDqkVw0vyKM3f4pYna2Ai42zVuLZd9LN50GzRVXXtja18HgiYCsizx3As7svsDoUQIj0OSASTzyrr8L289/rr3dnrr298/to+LXzgj3jUQ64YlomPnwuCfPk4j4hOEojg7mBNJMLQlODQ/sIvXLc/9mNLPDqqyNqSrvm+DQj0ay9VZXgWaOXw0Ep4rvzdv3sf3nzzYvoSV0VuMEQyzGazYe2GVVWVHqfpDJ7y+LIPAkmprXY+r8xi4dzJ0M/f3ozP3u/rg1u1OZkTROzwIpwiHshhw/G5jCDE+bcd5cmNmC/tiQBBkMQaK8gIBJZSpZ4KSNRLuAFgApL4CjGVyYML3ntJxz0DOx+k0CEisfEzQb6hngo4rBQ6OIiC4jq+YJlpmkACSiijhLP0wE6ISw0ZWM8B6kucR8GrRD8YeRSUbZxiDnAR9IiBTwXkxIl76NGfzmi2McasV7jadEYLt8pk86i+wEeMekiEkAGe+zOLeuxtb3sA2dveENGLyLsPH0L4o/Y4IPJorQsQAj0RRQixVjpjqFMYcQ6Cx4VGSDT64T20zDALakWgyVPJa4rxBClRhWCX4JHrQEoNRxYysxgMDpGEOZ4n7CXXtyLnuWW6lwQUxehxzXUwAYS+IFPwPkdoIgRkGMBscVGenr2o1LwX9p6FWXzaA4c1TK83SvteAI5rALjyaq1GwRforF32d6vKv9WMJ/eRt9tpIW+prJfgWX0QQfF5nhoG77tutlWdnDhTVUNz7Vp/+GM/Bgc3b/qZMYPdbjuz3Q40jg68lxIdkacsMB+HQdOtYo1HF9Ks/MXFACLwgzRqGlMdHFTVbGaNtaaMulc6dAoe4unC9e3KbdqN284G7loGMeVbJuN0UKbatEb/8ZfUcsUKJK+R2FAz1PVBgLrjoKMQaVqOTT0fq6ZmYyvI0IEZNhJQTCAkr4vKYyMR56gHjn0vJ3fuDPe/9a11d3IyPqlNbCk4N0EfHj4+CJVI8d/fi+XP5XMXhpJruZuGVSQi6oXTMELOuZFGJkM08TOfObJ/6S/dDNGPBS2XJrevK+d6cgvmMmn05k2dJ3IoRMD/3/+vh/fe24LI4z+LdtM6O1uZ+Xwm1hpCJC4ANYWQ7MsAIUAEU1VULZeV32xc9XY33Hx32954ueFHLRmfi8MjKAMH78WJT3P4hFKNBVtCQCxkXj4wo+f4uiQloIugN4gillKGnsrXBUAcuHKh7wHBCwpnSQaG9EpICMmEgApHSPARHAhJfXxhwfx1FYor0KVIwp8ckYG0RM4x5fhey5BFSZEZJo71HoLSAcIGCS8IaSUgZ4BwAgAnCh4oeDE38w0RrQlJC803Aw1ppkeVoaOJEDIEbYHD+nM/ElGPve1tXwOyt7196Utfgv/Wf+tL27/1t/7L9/8z/5n/vBVBRkRvTOoBDxB9EDpE1PUY1qM+Ro8FeUTQNROBUL4yypBhsieissZJdCRKkoNsuoFyPwWVfQniT0GhPA6yV5OCPfkxpagcClSU5+vxJMjpVqT7ohKRARczrLUGxMkwON/3Xr0Ez13neBhKZERPUjwUH634WzDaT/Gdxe3hawfN+ptzWZ8bv17Hqm6qqnPbtlHVYnFWBwV/0czn53Y+X4XjF9S2G7R2C3XtUWshVN4bGceKr19v6dVXW3zmmdYfHy/G5XLuDg7mXnPWm8YCUSqqecKFrjCLttDdBODQOo/urbcuYq3GD9qIsHnppcPFzZuL9uCgxaqynsh0KOach+rRuJ6/t3149LB7dLQaL5ajjK2AlL/wXlYv7wBIWQpMLganEp4o8pgnbLrKLteL+XNnx4cfe3Tr+sdObl5/4eza4c31wfKoa5qZ01oOW1WY4SP5XNsRPOk+HyOT1xMB5aiI2kWAxre/+tXNw9BWd1yv3ROjHkSkmsLHRw4eaiIfGjwKfDgl+LwnKMy/k26XrBRTVUENApBJhegD6vFXX11Wf/2v39KmBDZEMExOcTMZ8HaFiMVPVY4jNg3i4WGlJ5G33tqW4nSBq00Ly6FtrU5j1+L3K/O1MK7EDkNvz88vcL3uc6s3ZO9BLvoRDsGcPtead48M9sAZEPKtAIgIoCAqxpJ6MWQxCFIHKgNpjniNtalMbJFLwZuG0pDAKLSluxRgukmOKOci71QvwimMGCFEn9NgU1lMReJVqjZSoR7LEZAyMBByFKTU5hfa45KCxlL4ikWVVsIlGsKSoMNjTAfrAWGNBs+A4Cz4EyF5iBYfOuMejWY8deQuTGXWVVWtjTWacrX2lV/7xm9626d6jzqo1IN8FtbwLwPDl+BHzfa2tz2A7G1v/73/3n/5fLu1Q0qpR69pWYjEiBDWWgNCYY9OvTGSi9NVEI6BD9K112OIIGEviDKtkwhGMlVOvYLdvCyivMmHEKncNfVS4EPd5PFY9tNpdwU0LqMbOO14pWtOx0Ck/NWOI3xIho94bRLW0HUO+t7BdusVRHyp8fB+CiMp2pIFBgQ+2axmH8fvLq+PX1lad7/VExvmk2a5fNCGjklavBy0nh0crNrFYtOEFKt6udwECNlUYR+gZF2FfXXz5lh94hNVKLitzbPPEh4fQ/Xss9g+9xzWR0cEVUVcVZVrmsbN57MhwMiYNPNtW7P3AOPIKDKZan8JH2uFj3ffXQ8h8gHM8gMOvQHdvj1vX331+uKZZw6aw8MWKmtWfjQPhtXszubR8v724eH97YPjjVvPHPhKEKnMeVfPEISXMbS0xrRWlZl1SXnNEowJYCSotjUtzuf26PRo/uyD68sXHt44CsBxcGt1uLymKVa+ruoyhRyxQMeON8aIAsc09cpM/ORx8THOe7j/1lvDu3/6p+vN3budvF+thypFPXKZL6IBQPwoweMjgA/IYQyfBGpl0uf7nKtE/GoCsIbIWcQxFJvX1b/+X/9s/ZM/eWAODuwueHxQAJlAiMHZjGSzYX7nnc1jP3f6R57+3SjU13UNRDt/QklSs9o54vT0ArtuKDApqaGCRx5k+1xl371u6KwShQ7ObXELhLCeOLY9EGsydNhKfcaL3BpX97oqheKkeJAfo2vIbXJhEvHNn0Z4hNELsi9dxyGbQo2FdJZc96Frk8+ZfyKxtM2VAhNBZdxqtIQcrJbXyUt+ihcWhaCYbmVkpXyOhKdCckqWTsTIw6ATT/50pPHMVe48HF/VVb21lV2HdZxovq22q1WzWo/NmIcL5jkfnwra2972ALK3vf1IR0Pkf/A/+NL6n/vnfmO1XLJ4bxVCctQDPAB6YzCsVeCCV40pWgJsjIwJQESBxSMCB4nel9KzDItML/5B8n4KH7qewMflXVPYUE0vcxAxe5g8VzA/VibT23cyMnDynkDFl9c/aXBgrMAfXASP4LHrHGYPXVe6zEb4YJFSIyJB3xsBuVZL9dPPPbr+wuzNw4V/Y2Fd11fWPmzb9tH86Gg1C5BRN5r6Uw/GWm+MiSIirTPgIPWabjXagwOpn3++qcM08NDtx1TPPIPm2jWwyyWYpgGc9i8mIjbGuio8MbzY1pj5edfNz957r96cn5Pz3paL9EG7XK1W4/q991ZjmN8BIj/IWg9jnn/+oP7Yx64FUDoIn6HxBu3ZuK3e25zM3764e3R3fe/ovD9ZbrmbMYgBJAwCwJLVnv3021kMy3/yBVAkDnAouLVCqxqakznMHxzQ8d0De/zooD4+PWiPV/N6OTR1621Vlxa5BTIoeChRDcrrCWjAFfABOz49nwj79Zrvfutb3YPQWlfnoFyVckX559+qjDFBcW0+fNTjhwAeV8OH5AgI528ITgBEfTGc1E5kQ2FuEKAiRA4/277+S3/pRvOLv3hkr1+vpuBR1h8cQCZqGj0JBgDp4fx8vPLrUmwYRjQGsa4NVFUdXyAbFs/M1Xa7tY8eneE4+pxbBiUKAmeb0d9Ce/8ZS3dahBHScMFw8yOPAso40lQ1NFWFtYKFraE2ta6pouBt8HFdYfQ2eD12OW08rAwYyvAB+cY5gsgQzIEbPXovcFlEHjwYMFgiH4SEJt/C2uSZH7QDNBDRApjzP7+osBQvqeuW3q/GoLCVy+uIe6A4q+OMiDTicYoWT4DgUVg/YsMKHqcDDWfe+nNjzbq29Tb4TV3Xa6hgNdpxtbGbTfDbznYKHls4gAFeCtrb3vYAsre9/flp1RuiIReItBlHASJyxqjApTV6ohgVGTOAROXoR7hfPajPcKL3GQeAPtWdkAdQX2pLcQIiALvwEUSTYYMoQsEL5mM77Xlx+vxyDkmLqCsMp2lTksiFkZnRe0fOedTrjb53Wk5BsZNmr8cEhoH1eSZjE5ZOXSUKktbpmviz17uDT994eHzbvrto+3tjzf5RU1UnTdturLUjGSOIKI+bbLZjQgcHs6CW5vOKZjOktgWoKuCS616eNoUREexXK1rduVOdf+1r7eqdd+bnJyez8/i3w3WzDkCyOTnx48OHg4hc5tzD92nWEl671gbwOAzRmut0fNw6a+xq7OnB5qR+b/1geWd99/jh9u61jTtfeBmrFO5CdRNh/hzTiBeW98ZBDhl6w7CxDk7rkR62I92bj/a9xVjfn7vmwVzaswabTUX1aEzljU3RDZW+z51IB2EpJM++pFbh5NgukOh9+TFUPAS7uH/fPfjqV7ebd97pwDkp0Q0EQPWGiIz6nG5VTSIeBB/I5MOAR/bfJ+HIYw/7rPLznD/7VVEQzJmMJU+yRpEIG/XnP9/O/8pfOa5ffLGJqXBE8CQh4hMhRC2urVWRnJ87fv319eO/HvlY141xEGJdV8GnFMdgOEnVsqvVmh49OscS6ZpGQTa9l2aE02etfeMIYQueBxkUPliCtdBWmgbVUIAQrNXbmmqrABJka1NgJEZAdF0iFNEbSm1ws79MaQUs80DUiwOXhw/mY3lykQfPen6FGX0WAaWAx/QPRgjFMBeRl+iGeuCMnR588uJzO4iUaiUkWsOhEY8zNEEWY9RDIQQsnHrjz0YznvvKxynntrKbtm43s3q2njVBwZvGrFdmtX63fnf1sHm4htuwhRehg/8uMOxtb3sA2dve/txFQzhMT+/+1t/6jfOLC3JN4z0AeWPQIWqEI9WCKIQgKmjgEBS85KgIZiBRTwMijklG107XANG7AgCldnxSHD6dCYIFNrJ2LnsQHgcw02vovC6Gk8fmNQqiEACT9w7HMcJHBA6Fj7A3w+CDZ+OcIDMSUZmhp2swer7LrlmJAxa1mJ98dn384vLB/Jq8i9XFg9Ma4KRK8w0Ygz0uXelKIMmTmWGxmEFV1fkK6+qLxAmE8DhC6KIF3RtvSGhri+Kc5WGox/V63p+fz7fn5wfddns4ihw7RNWBR5wHzQTACqLKXJ71iu61RIiLRR2GwR3QCy8cyvXrc9c0djV0fNZdmJNxtTzh7fVz6W9tpTseuZsJOJMCVRPogHTRWNk5NLNDmM+vwXJ5A46Pn4Ub11+E1szXcnLydrMd7zQr/2679u+1K77TrOVhs8XTasSN8WYwYB2SAQoCYwkLdBgTIUOVj13CR9nnGo7pGieRkOwhiChDSIYPQCL0zvHpm2+OJ1/96tqdn4+U4zZU6jmC1FfZWwo2iXjgRw8eu1GPHyh8qOXUq2gwHdI3nTxanj4NbabjFkVqc3hYL/7aXzuYf+ELrZ3PaTfigYgfCD5KwCLvi+L3WPpe+FvfWgXv3/drwiyUIyFQVQbLb4BsNI6jPTk5ozCEcHqeEgXxo2PYbP3mOaA714NM5wYZPTPLHOf1DGZNS20dZBVEFD50Lof6IAWPFOUga3OkQteUazRUZby6JJdjuxgjD6ISEHbgVD5+IkxF8ASkKwYE0dfQPU6powQ88gdj5HROZF8iHQyqPLddBU6PO0YeAGUNCOeGjIKHQsejCB+GTjUSwpZPvU3wwRWfacpVVVXbg+pg2zTNuqmb9bIKNVv1YqORkIftw4uvLr66AvtPxVDBve1t3wVrb3tDxEFE7rz1VnVe13BzsxkPq4o2zuGi72HBzFtjcOM9zIOCpzWzzILmzDgTietWJKoOakSwCrJhXQFADSCVCpGyBxtkwjoIKXXDEiACTMdKESUSgEhJpQoOp/NB0uNktzNWXpZIB+yYoAij91rrEaFDIx/Bj7o2znlgFkwDCtMfxVNkh4OARPQ+gKaJ76xDFAWs8ZVrrrm52NIBnUsr3YaYTwixLxGGp4aPYhJsu+1wGAZIDYcvCSzrqmcbayHUmgB84hN+K9IP3/62TlOcgfe1iBCmLKCKAZZ8OY/BI0CCSIA+yOmeVCJDWCtcsn311cX8hReqaj63aK3x+uHH0buhdx6kAsKlNTRvvathfW7w4hHyCCA56Y0E8+hIBgMCRjCy1cFzz8C1Z1+Aw+NrAUIW0DQNuGEcv/MHv//W8PrZWxEmEBFyqhMYQjFIiPn4ZNx/8SpMAFAuCBH0POU+Y5J0nfeU1kD5uPosBRKg/LgMHzB2HT/4xje69VtvdcDMl3xG5QIWDTzZ/ryCh5pMNT0WrMz22H39Aiis586teOkzn5k1n/50Wx0cGGPtVVGMHXtyFyzEy/lAZQ+zGdqQ1jjqfJAwcweeYLLdjnD37okRYb5x41jmkY6snpT6vsPNpruqhkqBVf+duJPVeONu52+9CviV2rsRRRa4qBtophGPKshUufB8UhBOJT1q9wtYIhBqpeicgVFvef5ruVGEC0CjnIiS4IyBI7ZseesqrHoCKjNE0vmDhbUpE8qJ03nS62YYkTKJRHTvg3pA6BGhA8QNAm4FZSNW1mx4KyRbtrx16DajGbUIfYsVdo1pBmOM+q42dTdv5t2MZp2pTVdTvYEaLm5Xt1dwc59utbe9/dMEIHvbWylSXonI5t13q4X3cGO7HY+txYVztKgqnRHCs3HEGbOZOSczEZ55D20GkCiFD2YV1AlGUIGjBsAKscCICi2i1AohadAhGmNKR8sIEKV2Ixe5E4oU4IDpNf0UQvLnKE0mdX/FsDFJfVhS2pUHhY8gGgYu0Q9UOccchN6D16fl9DLWyBAzdkS4MsZsvZdNTTC8fK2/dc2uZOFPnVmdnRFzD5M39rTwMX2saGFr1/XgnANrzYSyygecPjyu0RgIQww1q5wbxNWa+ZE7O6vG1WrpLy4WMo5zFDG7tdCAWMlO09r8GgLWyvzHfxxv/cRPSCieTxfoJQMtX3wxCEnKJkIRhtWjR/Dgy38Kw527+ihALt8tDi5t0vnPwJ29BpuOAW/3MC4WQNby+uTkwcVXvvo2lM+coAsngl3YKB4vj0ePSZChgvIa4BI2YDrPQ/cmrctxVE8ZPAARtmdnPtR6bPswVPCxV8aI6vEHAx958xHAhzz2jqd58mUzgKlx/sdaLvyLTX5uS1WWl9kMmk99qgp1Q8bmr/E0opHtqva7j4OPx4IIAqBcu2bMiy/O/Je/fPpUcLbZDHjnzgk5x3D9upO2bcPa0cWFTkDfPu6fsQ4nNPXcHt45888F1llco0GwruYwr1qM6VcKH6pY3xELwjFPHofchSoILwEEg+Us0pRChYKUp5+naAR6JKCknE1V2nmUTsLIqP8RvU+jI2te94YMCQtUVEnwovdbtKrSFQvVUvWcxIiHBENADxjBoA9+A5Dgg1HWhBE8Np58p/Ax0LB2xm3USyXDzMwGhY/GNkNbt/3czvt5Ne+NMQof22N7vCVDq+HWsP1N/E0He9vb3vYAsrd/akGEg7sQkVCjXJ0MAxwHEDkSweV2i8u6xsY5HVTIrfdmxswtMwXpXoKHRiEkrGcAYPVYjn40AKCqEbEKviKCWn3eG2YgkbAwgt6TOCdAhKJA4n1qQ88MaqimPkPJJCJSakHUF2O4rP8QcI6DnDg3ihaa585XORrCCh7qw33sRWAgwlFVVbJlpq33vKm0JaSXFbOsxhHWR4bh1qy7Ph9PXd3dX+PZ6QpEPhR85EJYx+t1h2EQITRNvdvYFKfgAbB78UP1wYHxR0e9r6p1fXy88ttto6lY4+npIW+3B8hsJpOkd18eS7rV4id+Al782Z+F2WLx+L9IiySX13h4BBfzJbgRAHh67jwuPns1Wa1g9dWvwvo73wGtc6HZ7JE7OfmaeJ/CYtP0M/WISDnaUYAAJ1EQLPddRjuowIh6TEIs+xwZKWAyjY5kD8VT0PrhQ/fgy1/WlCv3hD/L458ZeGT/IYYSytO+Udl9fNlf1inhbiE+l1AlorfPP2/mn/gENQcHZZbKlTUcTx/9uFploE9M8bp5s4aqMqUl75NM+t6FSMgpbTa9zOdNDJOen69hHB/7fFNVZNuZnT1Yj7dOQF55ce7emi94AYu2gUZKh6sIHZA6T8U9WJNb4JKCCCYTEMBJBAQQ08KzL18tKAlZ+T5dXzanDrc8O1YdlPSqHnp/zudbT55nPKuZUnpVBZU4cGjEsIHU5ldvguIYeAz7AQEHROwV0wRFtRaQDSOvHbmNR79l4m5L2825OV9d0MVGjPTHdOwP7eG4rJYDWBhc5Xr1UEMEkevz6+sX+IXNP3Pznxlgb3vb218oANnbHkTOROQipGY9rCo4shaOmN2y72E+jjQXgXYcQYFEYaSxlhvvsRHhIKm9h9paadQj+lYfT4S1wogKEZtLCAHLjBSEKiIBYzBCiPcRPDB4Fej9abI6BAnmaAepn7a+AhAo0MGc1t5zWGt0Q8UUFD0zY5KoWAQ8EQ1NE+tenDHUI+IGQLbew5ZZ1uMYtep72L7QdPMlrHneP3Bw9qBn57wpV01Pa1c9lhlgvd5C121BpzrXNcGO4U4NSDkNEiE1jRav19x1va1rr8MMq+VyHaDkIkREFoOCyGp1AMw1PMbqV1+F53/qp2C+XF7m1b/PxSzmtbE2dut6GpNEk3qRB77vNyFS8zUAGKGkTF0V/dhdZxApysBQHiZhTQUwCnhQhpAS/ZhEQxCC1O9MNceLu3fdw698Za3D5q66Is7Q8QOJesj39Wz5oYBHsZxqJVe9Bks0lB1ALn/JjyASfPXCCzR/7jmwVQW7AKKW/QcCEDVm3o2EpGNNQ+b42GJVoQwDPLUNg4NHj1YYBIjwpPbVSIRWB3FeNOPNhwCvbheyPjw8r3Dma6nHllq2YiHP8aAKKlL4sJiUu1thQQuY1LLFlCdhRMg3wRIYkRKXyqlRnAvR1QNIuaW4Zz4kPfQcrHfovNamOHC2ooozJKWp6GAcITkCGpBielVfIh+MMbVq7cBtOujWHXZrb3znyCl8bM/t+bqnvo8dFw0Ngx2GtV0PoeZjnJv5oCByj+51s2q2PZgf9P+Na/+NHva2t739hQaQve1BZKUSkftvvmmP6hqOxxEW3rt53+OMGVtm34wjNcwQhJWCiPcc1mQ1EwiAgqRNwgYRGiLMx1JUhFkjJkAiCN4jBgkRYAYQKAAiAhj2lCAEKQNIPlYuPhCY9VjqF0UUQQYQ052TuSWqMiwxG3oA6o2B0VrjrMXgqfyVbysC3f+fvbPQkeVY8n5EZGZV08A5xwdNx74kLTPzrvhjsHCf4xP78xPsYyy9xMeMBt1r9oHhme5prkqKjezpkkqlmd7x3Llgbf1bf0VkVnZXnx5Lqp8jwTleGsPzsuRFR/PykbHZ9mLosuLUxvnEVU+g9HUWnTdVP5k5TfPo9y0YowFFzakpyc2PI1GWKep0slo/o9aRBoOF7naLTEDETiYDOxrtCIjsMrPC+udsbcGDX/5lGOzsgKoqDXCJqmku61waq+hrJ8BzY0eAKjYUEeCLyLxAxNrbRBVs1N2EDiIU1aBlndcrIiiqVz/EULUrGKm8fhgGcdLk8HC12FyALmyAj58ceFRx8w1uDT6ARevAl98PGRqqYJm5+vtw58kTknVLVMHHbQGI6PIqiNZInQ5iv6950yGRm28G1xEZQ5nqqp2TEh/NMjh41J87nbsOdHyGmTdgSgWqL+6Kg8JVJIkgpoqyIYmhWlieYoy8MotWsVIaV+1QFThEx85LOw3A2l8AMCIypE6kFGUcMHKQ3AYMPsSAgcLqc3LKPSA4ICgZuSAkK+2LdR0QC49+sUSpcsBkPsbxrKSysGjLqGMZVChRo0VEBxpsytmwlTE2ZtFZZe2hOiye7TxbwC6k+0Ro1arVpSL4B6hW7WL1N9/Ek6dP4cvvfAc+2t7WX+zu6hdbW3G/36fDXg+Pu1067nTwVCw5HomP81xJpKNOJxlTfpic53gkPpD+lB9eXEt9kD7jWOJZ+iy5NjQGh1mWDCPxufRJxHPpH1WW/uE6P9caRuJ0XfpgpFTqT9dTP57JtVPpOxEfSfuICA8RcR+RXsZIzwHoRZbpA/nu8u8yx/2+ORWf9Xp6mOLWVmrnp4NBdvLKwAzv07wc2LOgZqeWY4iRRRvh4/oVEQ4h8Gy2WFVBJIfmkOYakAp+pEFKKcoyc9mTHCoVE4R0798f9t98c6/z2msvqN8fM0CEtXryh9598ACUUtWuRhexZqzu28iDc+BnM/iaOovMRxK5mmoFzelXomZVJKmWc706UgcRUR04YOV6Xpu2RbhWajPjZH/fDaXy0YSP9eKCH3a6FVfJjeGj8iXi61Q9xDf44lXV8UpC4Es+G+vzKJXC/MEDrbtduuTQwRsbEa++nu6RZQRZpq4NHzeUUopU3tHdMcEr50APonED05t0dfe8ozujXOdnEk/FZx3TOU/9ucqnCtWSgAoAcAzsY4whwUSSjz644LzEVb6yDAlwsQWu5Kux4gQVoeDCe/DVWjlamUGJCRnF0o7ACOgBoCy5HAtMnBZUHHryB1bZPclfSnzhlNuzZPcLVewt1GJ/jvPDCU0ORzQ63qf9w5f65dFpdno2ykajRbYYF1kx9pmfeu1npmNmWTeb5Z187oyb+56fZXk2+bjz8fmzN59N4A7YS+GjVatWLYC0alVtsfvkCRy9+SZ8tb1tvrhzRz8TIHne78c9gZGD7W06HAzwKEFJcoKLBCDdrhL4AIEMEkPqE9DAVfsCRC4gJctAYhqHEiswSZ8DJ3Lt2JgUMfnswlABygpWtF4ByekFiJC04UwpOEOEUyI4RUQxHBPhEQAeANC+97RnLT2PUb/I80y+f3YoR1oc7e7mJ8l37+YnctzFSdXe2TGnW1v52Rs9XmzbscuKoafyPFbzzFMSb7Du49LVtmka1mw2B2vLq/YZxsZ9qhOgUxUEqyeyS4RKsen1yu6DB2e9p08PzZMnIzDGgda8JX/kvNutw8ZFXOdXwQcyQyHw4UejjU/dgFhvewnPpc9CUxVM1GLdSFTfAYukzVXfShcRoPG2OrDU4KRe/WAGgMnenh19//tzLsvwE6x63D54JDXhQCnCLFPY6awMiHjTBewxhQsjNFT9t5ROO8+2t7XO88vA4dp9VfvaUKJ1VVi4dTBrShtD+UzB7kmgx4VKAHLeNQIaOh8KeIwljiUm+BhKnkBkBSVGm1OjzFChGhLROQBMI8Q5My8CB+vZlxKdxAQoPohWYMLeJTt2fsazpQXrEDAiUJDoxQ4RC4WqIKK5Ij3VSo8zlZ3LPYda6zNQcBJVPBHwOFjQYm+u5i9narY3o9n+RE0OxzQ+StBxqk6P9/X+0V62dzjMhqc2s+NgwpQymmKOU8rl8zM1Uz0187mfJvAI3TDdHexOT7onk8/0ZzN4FYoWPK6nVq0IWrVqQYTF9uFDHD96hHtvvYWffu972f+/d09/fzDQz7a28CuBkJdbW7TX6+kDyaXaAVLpWEGIgIlaV0NQ+ihZ2lBVSo6lXyKvASW107jk1F8ZpA0CLHiYZSRxBTZiPDSGjoxJFQ5O11MuUUk/HGpN+0qpfSLaQ1QvQqDnZam+tFZ/pbV52euZPQGQ/cHAHG5tZfvyjHTY72cHF1HLdzECQfoUgjp9GG0xsEM2xbGCaBHW4tuAD0ROga31nBa8LhZLcM5DQ1jPG+tAUCkFWtOG+3OyjAtZv7/IHz+eqLfeOqMnT6b9u3dZNQ93q9+j3lfLYwgwOzmBOB7DNcUIcMIxjkDU3Fa36rsURiqLajmu1FikXl+gnvJGNQSxVuEBcWTGqVQ+zj/5ZM7WxluseiQx32rV4wbgkSxCOYNDtsHdpd///Uf0j//x6+pf/Is31DvvPFX/8l8+Vf/kn7xBv/d7j/Db397BXs/U719f67HpoZ2v/jpI8plmMCBSCjcBQ/Osj01j/l4jAlgboQLKW656NH8jMoYMZNgfenw49rBLvXE/75/1TG8kHvay3lCAZJTrTJyPM4niofg0U9mxxBOjzInEY6PNsdIqtU8NmSEhJUAZJ0BBwmEyI48Z+NyjP/Xkh6hwTIrGqHFEms6StdJDiSfSf6bEct+RUSb5TGklfWoo44+ddselLo8XenFSqGJY6GJktR3O9Ox0YiYn4lOpdpxJ+zyaOA1ZmFBGCTymqqNmOtMznet5nuezTrcz3+0LeOQn42csFY/HsBT48PDDqlWrdg1Iq1atEpBISIZPPuGuc8Cvvgr9+TxuO6e3iEKfWXUAsMMcJFLGDIYZsxhBe49kDJDk6D1QCMzeV21EZiTmSBdRVfl6ETkhM6QcpCkmCAE5RgZx8D4yIgWiGNJwAGW9Z79c6rIsyVeL1eUap3sBUHQOU9sDgENEby2UzkFxfp7Ndz3bN9xYR/fCluVRJ8KF+MLM9fNJbgQfNU2nC4GQKXQ6ORujQClqvBewStdmFMm4FPhq+Kh3Ba11oXZ2vBsMhs77VznGASmlmmtOqoXj1b1Z8qp/OZ/D/OVLYO/r6z4u+yGqa54BXkh0m0Dtkt8Hm4vRaztlQbMP69Ox6pWP2hqSOvQsTk/d+aefLprwcRvgUek213rw15xOhDs7ufqFX7hD3/72gB48yEGIG41Brn4DZmDvGayNcTp1vL9fxB/8YMI/+MGYFwt31X649XZkTgG5+vPVhqQ2KZWMoitPM99UHEztekxOqrerI1qI6KKdXJYRrlrLcwtq/DtR6Ux1h1btDB3dh3w+M4OpArUkpqVG3adICwLqIeMSAPIYo4kQNRPrwIGSQgwKGXFlQoAIkZEBGELkGIgpIF8cCBsxWhedlVgSUBBDbfk5K1TMyG6VgwpKqZDeR0QeCYNc90DgDRmrSQeNOo1xyUxcRIxFWlRu0RZyLY21lqwjQ1ZAxYMCByTWYgUWjDgTR3AtdLRq1QJIq1Y/Un33u7hcp4X4jJkVgFGjEQycK3rGqKwscZsIDTN0Y4TcOcxCACU5SUTnEpQAp/aFo/SjZob1FrKoLhanq3RN2gokoPQxc2AZy97HKDECcHBOecm9cxBmM3TDIbqyjAExAjPE2YzDYgHc6WBcLjESUUAEl+daIAOtc1Aul6bc38fi3zx0cJc/ujt2n1MBpa5XO7i+ePqG8FHvZ+cCnp/PoNfrcJ4bFhCprjWnYlX5Wiz5te7PF8zilFLaEpX7BwdfkdaPX7l3747JMoOXTP1qbuEbQoDR3h5YAZDra1X9OIf1o9Wl34sIm+s/RFCpASH1J1du/Lawhg+iCjzWsZbjcjj0o48/XnBZhtva4YoBGG6ujRUP+BrwgcYQ/czP3DG/9Vt35TyMHvb7CpXCS4dnGXK3SyzTpPjBg058881eFGDx/+2/ncbnz2ebHtwrPL0KvbD6KzJzYwH6tc4AqSCjGStXIqIaiIhCiHEyCXG5DD+qqkdTyhjM5pYGR2X2cOYC7m6NiakgoFKzXgJDNwEIRO5G5gQfJsSQRY5aRaUqCKFIhLyCD2DiKGIZF4nJyzWPvIKP0qGzBRZlVDEAQ0RAICCuDi5MfQqVBPYS2ZCJgLCCD7EnpBVEGGXSda+UspI7GReYeAU2nny6T2mVtV75NMYtaGFBgQcNKTowUMJA8ikEeCz+catVqxZAWrVqhYhBQvLwwtWWudA5PAQ5oDhBAeyWJWTOgcCJ62mNyvsL2LAWDDPqGEEhRkpwIm1lDEAIAdfQAtVziPeQ+rz3zAIVwVr0y2UIAkB+PIZQFBS8T9wCEGNgZvKIEMsSXQIRY7QDINfrof3qKywfPMjCz/yMD++9t+MBMPzVH77bffHwyyzYSZ9DyBsP+hwBkOpPYD/k1rw8mxUJQjjPM1ZKgYDIhulY1RHQfMVn8mX3QWavEaNCzIrFYvrsyy9fFGVZPnr48JVut9uh+ndihvr/2WbxbDSC848/Bi7LZtXj0h2wGMAi8wuJvuoFojpQ8FUP/dycCla9N7kCj+TmmRKXrCWpBKJyOg3jzz5bclGEnxrwqOJNwKMOH3fvdgQ8Xsl+9Vd31b17BrWm6+wytbJSyA8f5lFghO7cMeV//s+n8OGHI4gxbLhtVQlsfm0UMSTAC4ER4Krqx5VVkMvgQ7S5ApLyoojh9NSC9/HHAR/Vyei6JJ0fLbK7oyW4p/0JYFYioE0ggoxdZl6IswQfMa4ARLPkLnrto1eePamoEOOK2ZAjx4gxkUmECAEQvAPnHLtyEReljA8AEBWoqvqBIBkxSYJxXQUJChLiqKBJh4BhVQWpKhgJTDLKgtbaS+5yyoMnv9rBCgDKUpUJPhKouImaWKBVpcNBvgaQ++KfUrVq1QJIq1btKezLWtcCGvrwQ06He2uxcg46zpWGCEmgIpeIZQmoFBgQyXVcLomV8hgjRu+Bi0IH6Y+jkefj49zJeJ7POeb5xXpxIo7jMUcA5QGYAbQ1Jsa//dstB4ABrlB8+lUWZvNe9H4bmHUDQOqb0m6Gj0b148qxzJHPz9M0LBONUazUFkhsrv9IsTr4hL0PHCNfAz6qzwgE4BWAJkTlrHX7L14cFKLXX3vt8aDf75Govp0qr3NbFHD0ySfXrX5UcHKcqh9rcNj4+zTXe9RB4pLfcaV1rN6b1AQ2rvWzLwoYf/FFISTsK/j4iYFHEvOtgEcS3r/fzf/0Tx/mv/iLO2pnRxERXueQP66bCGgwUPSd7wzAGPIxsvvggzMIG5dTcKMyWAnZOQ7zecAYGS9Ugci1+byCjSrfVAFhAPbjcfAHB2UN7G4BEDcLRUoZlZ2WHb13nj38FT1fdreXEKHEiEsEzD37Dkc2gcMFgEDQPnilQKsQg/LRo1xTFAhXEMEYk2RMUKyCXHOWrZ2GqZ2qqbNgIzHRepoVJFUHE0o7pn4iChp1FHOCDQEMX1LpmNgrUj71Ky1Raa+U8oQUpN9prW0Oue2rfgINe6bOLg4SZHASAzwUo7RatWr1TQWQVq1a/dzPYVFrjuEK/c3fsJHAYgLRRx+t8kr83nsQ330XKM8B/uIvINZmiTDcQIVSefS+F0PobZysXtcN4aMCDC5Lx2dnk6i1CkSEg0EPLyAEqzFYTTNxzokDxMjXgY/qIgE4DWCsGBCjiE+Pj4fR+/Daa6892tnZ2VZrCOE1hMit4EBOMh////8PHEKz6tGEjkqOYzxgRC/5jStDm/9dtVs2p1ol15AkeA/T588LPxpZiBFEePOtrW6/6lFlN4KP7e2882d/9rD7a7+2owYDXTFkk92uWk+eYr2iQN0u4dtv96Jz99147PyXX47hEsXGtr3Q1HLp7fm5Z+95M3xs1po1N7JE+uxYluCPj0v37Nni9qsem6W0RjWxHfPlqelNinK8u7PEgF2PvsN+VfnIfPAp6shRhxC0U05Jvqp+aNZkg12xBEWKzByDvBy5GDjYCU/sGZ+5I3PkfPSA6SVSUWHKNWgOGKLEFYgkmABcwQlr0tGgYSWjjTIeCHyGGRttfEd1ooBG2NJbQWvtcsj9S/VyMdbjIssy+xyeWwBw8KiFjlat/gECSKtWrd55Bx1sFiQIgVuS17obQkjeuv5D883go+pGcdqWl09PKRChiKnX63GWabwYxBwjs3M2lKUNy2XJIcRrPsNW60iCAogaQAeAsnoCHY/HU47Rh1dffXznzp0dpZQGkfceDr74Ao7+/b8HXiyuc95JNWbEzOf18Sw51qlhw2l0XO+W5ArYwMqwQQmylsfHrjw5qeDjJwMeScy3Bh5J2Omo7h//8YMEH2ZnR9d+kmtVP+p5fbpTghD49rd7/rd/+97k+HgB87mDJjPzSii+/F5lGe3RkQ2LRUSpylRjbqrmupEKmCqlytby00+X8eBg8WOEjwqAUEXq0qfDzs77Hwb+3q8eRgc9Ru76zGfsuePZGx+8iexMqb020VDgoBw78tETKECKxBwZmDlYeU311B2EA7sHe37K02jRwlosY0kiGjCrdoKPjDNO7QQbCMhiSDDSVV3oUIc16pBAJTe5v6vvhgQhAxj4nu5ZMFAe5AflMRwX78P7Dh6Cg1atWrUA0qpVqx+fQozdZGA2lx4iKNn14eNrsAsz4GQy54tF35F2dz2lxenGaEaEkFQUZZjNijifF9W7rgFEVcYKoJqGRZE5VE9zy+WyePnixV6IMQiE3PXO6eNnz+Dwf/5PCAIfCI2tv2p5Qyw+BmZbwcLmqVrNFK58D278iMsvuvE4LPf3C/CebwAd9fR24OMWwKNS9iu/cq/3W7+1k+3uKlJqw/qKa1RAmjtODQaq/zM/s1V+/vnd8n/8j+P1G3DTVMS6kJmLFy+W5XDo+48eGbgFNashRLSCkOg9l3t7tvj44x87fCShiEh1eGTv0d/8Z/X0wePj//ivf5bfnr7dzXzWcaXrOXadwKETfMhytsZGq8QEERTECB4UL8MSF2ERJjAJz+iZf8Ev/L7ajyWUkITySmLgBCsY5SU5ZPKqpFhxDjkkBQqBkDhA8NFEVqB8nq9Oaw+vZK/43XzXP8EnTsa5PvXL9+6/Z6FVq1YtgLRq1erHLwagz63NY4yZ5OYKsIBK19/x6vqFE55OFzGEGJzzuLVVQqeTMRFxjCEuFqU9P58HiXC9D22ey+EUoiEAHQFC/SHblaXbk3Uhk9HIl6PRvfMPPsjiaISwfjildUTYIOap+LgOB7xpwf7mNTRVNaT+OdeWwFpc7O+X7NxPDj6a4HFL8KEePuz2fud37mSyg4I2Bjct8G7CRxWbrlcWMOn+/az/C7+wXX744RDmc38dJqzLPns2nz17Vux861u5gDRBXbdXDWE/GoX5hx8u/McfT34imygjohI5T/fs3vJO/m//tvvOO++l7zJN/hv+G/0zo58xhS50FrLu3M+zTujoqZ3mOmo1DQEDLnniJiwnjof3/fvhBE9gJi9mJgbG6tdOOQJyEQrqQQ/c+tWXFyqMGjSwyKKN1lifYRbGOPZd6oZBNvAP6IF/Ts/92+ptvyyX/Oev/3lExAitWrVqAaRVq1Y/OSFA/IRZQ4yGQ8jqTzxYjdn8LHwj+IBaHzIzLBZFAhCJndjtZqS1gihaLKyfTBZpiIivCx9YRcSokplNQLRcPYyK0sXgvTsfjQ7dcLiM1j5k5v56yg2EyyAEsQ4LLK2jyFwg0eXfh+iquUGX9cNNwCOJY4Q09Wq16DzGbz54NE417/7u797rvvVWx2QZNneZ2vyRGyGkgo9Vjp0Odp8+7Wbf/e6u/b//97RxUEe12OpKxfNzO37//fm9X/iFvnnjjQxEtw0h0VpYyuYC8//9vye8WPgfN3xUIq0JnbvjtH5chDAAgAms9Q6+4yUkJ02rXQL/9vBv9UfmIwILeuiG9Kn5FD9zn2FBhQoqIHsmIECWF4iijwjyqrbdXegFE1/kFiw/UU/SUD5RJyGjLNxX98O/d/8+QA4RHqzvj8Ap/Ht5Jb0nr1atWrUA0qpVq5+w9t59V8+eP9eR2QAiNeHjuv8Xf0Pf9R9AnfNhNJrFyYRAKQIWhRDhZvBRjWPFHDSAcuL1gxExc31tBZu7d8fIDPbzzx/DctmrIIA3T8NyzDxM3Vd+rxi5BiEVtOBGIGG+dN4V18ZwPTJzOR4He3b296774A1dP2bwuPa5FfT4cbf3cz+3lW1v6+qcjWb14/rwsbkKksuWvgI6Pfv++wgh/B17b+HkRq4t/p8jqbtNwxBcuHxrL1ceMzMz/DGvHjMz72PIZea9TLt7GZZzd5NMkkkGPWO7QTo/qd2qdKncHvfYmcr7ffWpUslud7chSZU+OefoENw2XywuwsqUOaXg4LOf3d+5cGGutb4ueKPBYIbQMM0r3vv4x/fSL35x96TlwxUyROxkQXAq2d9fBICNCXYJTGFIDC5fBAYvMyeCgqsgoAm5jIAhKzbfVQDA8udGa9S1F1yT4PF4vIB4PJ7/e4gvf5mpKGJExEbmmVgfqV907h6y0FHykkuHHvbYFPJhj6UcgOuZEQCSbYBelgHGSKys7JFSLH3mmTMQx41yHn4Fe0S054iJIw6Vr5XviuB0Zbc4q2csZigegxkyjikvOs8yOhHxcOSDpl3MHkHjFa9YaJw9G3IhbJO/CvmoV4SulCqLSP5cNJssOn++ia2WoP39pM7nN/eQ168f3vzYx/bm7r8/XHrJS5owQ+Jr19K9hx8+6L7pTddOVj4q/qyECKVS64MwXCEAhgDq+FsElq71HcY9nv/fw8Dj8fw/TfbAAwoZYwTAi0XESLCufDgL3PqRkynkwwERFUMEASCggNxyYisha2t7wX333cAgiNEcgjEQ3dIjKR8pPcDyqtdZBCK427uSpko8nMgHFc9VkXoVm8YwTjdsC90p+bCLd6iPawXjYMvLUfOlL20H8/NcA2ZYCbGPJxnuuZXHwhCj1VUh1tYaFYtvcv5cLVgcg4OPf3zr2gc/uN+/di2ZmXzcuJHuPvzw4e473rE1RZRqpqKIiIwQVxMh1nYfeKADk+DxeDxeQDweT+vLX+ZKqcqiaAPTM9aQj/GycMfkA8vnOiJEHDHTgzNENq65HjImg/X1XXHPPbeYEKm91ajO50S07SzwK72tlMrjLsLtY7f5A7nn2ZmK2Qypi6Wz3d0UlJpQPKZPuSKl7njUw8K1CDTOnYtM4fk44XDkpJaYOPfAwPQXabfFGGtDVz7sbFC9Xnbzve/dvvrBD/aSW7eyqeVjYyPZ/uhHu7cuXtzMvvrV7nHEY9byYQ7gsNP/Usr5ej9J5mASPB6PxwuIx+NBPdhwJjPAlQ9nIV1ju9268uFCE55n5YMq5APQDCLJERkCcFsUawaMQogsOHNmm585swOIChyKHh+7RNSFEuQIx8SLOsopyYbGLvSJkEZ9ZdJkGZnmd6DnOyweBvt5AGYf9agkPHeuGS0t8XGiMYl4IOLkUtJoIF9YCMFlRAd0sM+dg9mVK4ebb3vb3sZ73pPoLXMVHIckUYdPPNHffN/79m+9/vVWPk6I6j8vuh1BNDQVY+tJkizAJHg8Ho8XEI/Hs3jxYgyMUdVOVug20nPPm7V8IOKkjQYnkA97zEyKAxBD5GMX5fbeYZjyc+duga4LGZk9T7RFAFmVVLhvQKXXycyjGF2zQOAUTltBkb2etKlXYwxjevEwKHVy4mFhjIUm+tFsMisZJzFEGCJvtVhFRIHGbVSGt4dKNzZ6O+95z8GNt7ylf/iZz8TQ7UqYBCkp0elbmx/5yMGV179+6+Z//deG7tB+cOIpVxOAnAeS81NJFC0RAAePx+PxAuLxeCYBASQiqkIuyI0+IDhMKR+GieUDEaeRD7J1FkRGQKQeHBHZmI9gB0GzOeD33HMTOp2e8z0kKbU3cpVfLRcItnaifCoNKclJWUasdbgikjejy/b3szHpUGTGTMSDCE8i3coFOYdweVnwKMIjoht2jI181HgdQcpjlXFjecvcLEuznZ1k/+MfP7xx8eLelde+dmfvU586SK9ejUHLoxENc09QiiBJCHZ20sFTT/VvPfTQ/uX//u+ta//2b9e6b3/7DdjbS058l6sKSA9VfpkxBgBLpg5k68KFJng8Ho8XEI/HM0kjQs45ccYUMibLC3k2XKmj5rg7XlVHOU5APsxEpYEASgzvgG4YwqoWOE3f2NzcIb/33k0Iw6TcfFABHNj7V6bouPUbFvNQKbKP7TU2slHapgk0WDwvHycT/YA4VrMWDzJjiN1ylnBlJWIvfvECv3BhlX3zN5/i3/EdZ9jXfd0ae8lLFmBtrYlC4GyiHg5RxMX8vOCcoyMb9VOunOvH3QeUonwcBxtw05CUUiklVZJA/Oyz2fbFizef/f3ff+7SX//19ef+8z+3Ni5e3Lrxxjfu3HjTm3au/s//bD3z4IO3Lv3FX1y7+md/dnn/DW/YkE880WVSEtaVjxOIVNmTGCIqgKU0CE4nBwdzcCQej8fjBcTj8fzKrzCGKBFAcj1DAdMDSxlMx9zxiuoUnU8rH1XXqttF54oNvxu32/GW5INGRms4J7ayss/Ont0ixlTRO8TIR1qZ66QU2ZnAvnfZQSqLy8Hd3ta6gJ2hiH6QFpBZ7m5FTpoYRpFgr3zlcvBTP3Vf8Mu//LzgZ3/2XvFjP3Yu+IEfOCO+53tOiR/+4bP8p3/6nuAXf/F+9pM/eZ85F23hNtFseosoRYxzRMaoInpRJRj28STS4p5LZKJL3W4GxwNtPRUpJbM0zQrXZQZ57Vr/8AMfuLX14IOXb/zlXz577c//PB+b//iPz+297nUbg4cf3lZbWwMoxAPvspQrAgfMaWamDmQwWASPx+PxAuLxeCaAeBCoQIiUD+skUM/DAYDMykcFCEAnt+PV+MhHxWchKyGoJ4ZIHFGALaq2mVrjPq8Qkp86tYW2HkSpbQKQNVf9bpF5+bkza4afj+x2t1ZQyDyPY0VpSq4/TC0eSgFyzvhLXrIUarFo/NRPnQu/4RuWw/vvbwWrq4HZCjfodJhotZjodHiwshKKe+9tigsXloIf/dGz4id/8l4TKQFEnEY+LBiGDIjoCGEoj1Gvj5KT6mOIqPp9KQ8O0ima9KEZCKBkmqZSKUWIjIVhUG5KmQvqYCApjiWkqVPhfxekXDlQxanIWESIK/GwDoSBx+PxeAHxeDzjwF/9VYkAKTKmGKKy4mFmpodbdH4XyAcckXZVhqywFLUgxPTEi+wyu86fqE6l2UzyepB2u0sA+654gFJUKSRKOektpeLy4qkqyYgqhKNUB2KfE0ipnNSrqcSjJEGIS0th8H3fd7b58z9/LnrlK+eD5eUgaDSYCAIQQuSDc57P5RFEEQojI7phoBER/i3fcgqDgE/bq4KSRBVi6crGRELhzs45I+VEQ6murVG6duO4C/ly/xiVZZnxD2WOB4FgjGH99LSTT7mqGQVhimg1i6K1Hd8PxOPxeAHxeDyTwBjL9EgZYsaKvG493Y3yQTB5g0MqVpVgZnX7PpIPZ1Z1sxHtz8kM7HQO2fnzNyEIkjGLM3LacJc/tBUPstJS3eOjeKKUmey2vKTSlIrohx3TiUdRZM7uuafd+PEfP9/6zu9cDdfXIyMVrmgY+XCfl4cw15w71wi/8zvXdJ3IaQxDPs1C2kQGsm5XIcBI8bCjhCsXVddURk7Mb6s7jieqKPx2IgSIehzZEd2mJhWF6FLKzLxMnAswUZD6nFDKVf1LbISKABZSIdbSnZ0GeDwejxcQj8czDgJAxphkQsTAeVohATOTDweqsdWue8/qtKuKz6eKa5ieOQBzF7+VImOPc064utrFs2cDcs4j9yJ7b2exX2o6aM+xERL7uCwjNg3LzqSSRKkZiEcxEDTszJlW64d+6EzzNa+ZD+bmuJULRzJGSccoQTHRkCD65m9eFt/4jWvAOR57IW36nGxtJaRnVyQmZKKi8/J9ZbebDb761R6atChDRTf7qiiCKyFk7CNJMqkUIWOMuwJyt6ZcOZAZ4+6D2M4AVgfN5iJ4PB6PFxCPxzMGu4gfMMREj0Gp2Jymlo/pttt15cP5PJWQc335BmQGR1R6cPOSIgKaRD4KMAgUP306wsXF0HkzrPwszuLVrQOh4rkqZshdRVFJSvLjMssoTRKpITruwtGKhxkaXF6O2j/8w6ebr3jFXNBsMlc+KiWkQkhKEhKG3/iNK/xFL1qYZiGt+2HEajBQdcXDZVwkxL5mJG9w7VoaP/NMD6v/rdCkC3kstlHO07DMjIjMCAjn7O6Wj+r3por7IGIoAdZMHQh4PB6PF5Cj8Hg8yFgCnCd6jmvJh8Osd7waJx/oHhsjKe4JjEgWBfas6ppxwsNaLSHOn+9AEDD3gqraEAJAKxrlRZyhMg1LKWXPJylBpqlKpSRJRPlLdcXD6elhiryb3/md601T79Fs4jj5sIMx5j6uHLqbfBR+8zevYqcTOgI2sTzpaERfp/VkCLMBESuHPDiQB489dqiuXOmxog7Klcw68mGzsGSirXHoIGjrQE465WrauhM6SmIQOQEsZ0KsdAGa4PF4PF5APB7POFgYZlyIhHEeI4CsWlCNTZVyIESkKeo+XPlw067qyIxF2fshEh++ByMiJKXAYfz9GUO+vBzqrXnbgGjrPtzFPhEAuiLipmPRcMZ8tvIxfGwwx8kMpYeJgIBG2miJA1WIRzHQKfyB4NWvXu58wzcshHNzbJRAMMbGSobTnXxkTUj0ohe1xCtfuVh8ltoL3vTy5cODS5dilWUK7qCEkKZ/5UrSffjhPdS+UPz9ADTYuYZ8o8H2yciyTGpU3ToQohOPelRfPv5eyJiZFlPE1fj8+TZ4PB6PFxCPxzMOliS5fOjRR0Q5UbShQj5s53FFRGamGcvHUUXnVatNVsxWQpgZoxsSmqd4pNwEAdOpWE2wvS/cVBWnEN0+taJhxcB5bAA7lyIhRFIqDUHRiVoW96quRnfSrRyYTiHrfPu3L4e6XsONdoyTDTtPep5pJBi9/OXzOD8fHidlTPV6cvfTn+4mOzsSHGYpIenWVrb76KMHyVNPda0/cMaQ6dnpco5QE5IyU2ma5UrKNVEUTJFudaLy4TaoHCdcBNCRnK/EnLfA4/F4vIB4PJ5xhHGcsSAYMCF6xJicVj4yPSQASSJlZnN8Ovmw1JcPV1yomBgRcUROnHMjE4BoX8YJiukJ9WBaPrhJxWKsuhidyHngFKm7aVjuXLwklaq3RHXSrVwaFy4st+6/vxmEIU6SWsUYc2czqp/bewQBhrpXSC5r1YyTKDj49Kd39x57rG9E7E5IiOz31d5XvtLfef/7b0IRZWKIZiDXsx7IbCSk3v2xiHIpWWzHq0EMwxA4Z3e3fNT/LAjQUAArg0ZjxfcD8Xg8XkA8Hs9Ysp0dGXDeY4z1GWJcQz6qFpKkChmRxaBZ1HzUlw8Lup8RhYDWAw8srv/Yj91z5pd+6f61H/mRc82XvnSRRRE/Wj40qOEc+dpaA5eXm1SxfnY7o5eFw6Za2aiInZU5T0rzgMzjfKZyGIXMcxiJve8YcG4ubL361fPBwgKfJLWqSj6qhMU9XywsiOBFL+pMLB7O4lfeuhVvvu99O72rVxOYMSrLaP+ppwab73nPtrx+vQ+3QQ4AfBgJYWIoIZMLiJOKJZMklhplbhOY8Blnd7LQfJbyQTAhjIkMYC3lfHkPIACPx+PxAlKFx+NZungxL0JnYdg3cz35cFKvAMhNuzLHzDh5+XCwnw8RAt00b+H7vm9l5du/fWX5675uYe17vmf13l/6pXOnfuInzgWrq42j5AMKWBQxbnLew5BBAVUV7tpj5XoPg31sh1OMroiqF5XVReaVhC972byOfjSEEK5ITDzc88fJCm82MTh7toGNBndqVSaufTj85Cd3rj/00H62t5fBrJCSDp5+Or7+9rdv9z71qa1RAQ6GiIIx5GYg4jGaEhIgkknBygvRzTHOOYZhcJcVmrv3qd71qgIEQAJYSsNwRT3wQAQej8czTkA8Ho8njKIeH0ZBeghAUJei6NyVD3LGEfIBs5YPew8sX6MFQ7zqVYtMN81TQrCMiOmZB6dONVa/+ZuXzv7cz51vvuhF88AYuvew90c7NHxxMWDr6y0nClLeAcuAIxdyRKUoiEZKsNJRKka390EzQMNG1XpMADKGzRe/uG2iH65IVBWeO6/XHlwIEMvLAUQRp2Om/Kg4lptvfevm9Y98pAu9noRpyTK19+STg6tvfev23kMPbYKUIxfyqAcrRm35KF1PWWbqQFKlFBFjnDUa0cyjHrPAfvRJo1RuITpRJ2VsPR4M5sHj8Xi8gHg8nioQgAKAHhNiYArRwVKj2aBNuaq6TlW/N7qlEdPLhyM4pY7oYDh7tkVnzjSzYf09lIcKQz7/wAOd0z/yI6ebz3/+nLmD+zncN2FCMK6b+WGjEUABaewMTh0IFVjxcAvQ7QC7AxaiFQ8LAmqqaz2qiSLWvPfehgjDSqGwx6cZjsigaLcZdjrBNDs+yc3NwdV//ddrV9773j21v59CHZzC9q3Pfrb33MWLt3be+c4bkCQ0bQTBvd4tNCGivA5EDv88GUZRgEEg7kL5mO7+iC0FsBwHwREC4vF4vIB4PB6PEDEXos857wKiqiMfVF6qVIsBqYoi3fE7Xrm4xyeTJQYFnCOcPt3KhBBGOOI4hn6/bwcMBgPIEFn7BS9orX//968HusajUj7Ku2zNzQmm70tVtTG360DAzqOKzQspwaLuY+R3dmoRahHcd998tL4eGCmYJP0KEd3Hxxq82eSmaH/auofsxo3+lQcfvPrM//7vTu+ZZ+oVpktJA11HcvXd796/9A//cG3/ve/dhDRV0y7iq653itZJxrHpByIJIK8DQSH43ZZy5UL1oz6hIlqJhVgCj8fjGScgHo/Hw/TKWwTBIQrRR8R0UvkoL1RGyQeWU7HswxryMVGkYzJZQjbsZM5UFIlESjTCcXh4CN1uF3Z3d2FnZwe2t7fzx4MsY60XvrC9piWEtdsBVsnHEGKcI19fb6A+113M2dSsciSE7EQ5Vk7cbXmH0oboRoXqFkTbVLFO4557FoJOR3DOK6UCEateO76MCAGAOJM+F3J7O7nx3/999fG//MtrV9785p3+pUvGHCVU0e/Lnj5n493v3n3i7//++pV/+qfL8Ve+sj+rRfxR12MxZJomxXa8BIyJPA0LEWf/nrXvg7OQD4OxWoW4mHG+sgnQBo/H46kSEI/H4wmWl1MMgh4X4gAZS2rIh4Wq5KP8Grnb3M6i18cEsoRQwDkDIZgc7jAFdkgpTQpWLiRGRDY3N6Ebx6z5kpfMzX3t167ABE0VebvN2Zkzbfv+VEhFRW+QcmoW2udF7Yei4UzmXuQsEDkisHqd7oEvLXXC9fWlSEdpRKuF1ZEN55jz/IjrKs9B0kipZlZwnaay98gj28/+2Z9d+tJv//aVx/72bzc33va2nVsf/ei+6eex8+ijh+axFpTtJ/7pn24+9sd/vPHsX/7l5e5DD91Ue3vpzKIe1fdAcOuhpJSZFZBhHUioZ7yb6j1cyFDjsxR9U5YyIVaVTksEj8fjqRIQj8fjmfvVXx1EYdhlQXBg60AKJqu1cMARYqKc5zNrNDiJLNnjw27UOHanLKXyVKytrS3cl1LoLWuXdOpS58iO7pwzvrwcQacTggNpwEnDMofcHiBWWPQ88vtgCZgQ1um0g5WVBaEjIFqSIs45ThjVmCgS4g7mXoc43FZ4MFAzr3mQEuLHH9/fev3rNy790R9devI3f/PSY7/+65ce/83ffObJ3//9Z5/90z/96s2LF6/2P/e5XdXtpmC5s1EPhBIMgADRXCNNIbqUkgg1Jg0rDMVdlHI1vXwN5bidAaymc3Pz4PF4POMExOPx+EJ00WwOuBA9ZKxfkgOaRD7KJ6E9r0ooZi8fFqo6hw0fYp2aAykl7O/vYz+KosarX70MUcQr5aMUBTEF6fkx0hzRmNDdBcuNgpCzExcrIiAIk8GazUisrMzzhYWOeYwA1fIxoVA4xyeKgqh+X5ni7xkvetHZ2YrU4WEmd3YSubWVKD2bY0BUfY/ZRz1wVBSQFdfmdSBpKtWwDkSwKArvjqjH9PKFt/8pRApxJSZaonHv5fF4vIB4PB6PSNNDHoaHJgpSFKLDpJAjH1WioOzj6eWjdnoW2pSoLFNANPFaq5ckLDt9eo7fd9+cOTRWrBhDvroawcJCCA7k9Oyw86goiCa/l7MlMXCmQcRJPjhyzvjS0pww8tFqRbl5KAXoisb4mo+qcyolxX1u0FKQQq+XznDRi1CDk456jGl8mObD3IrzwEghMIYnKB8TQWZojlXvwpggk4YVBAv7ABF4PB5PpYB4PB4PY30RRV0mxG5lNKEivYlVpye5nIx8IKJzLH+CUpr8qgykpDqLsTQMBb7whYvQaIijfg/WbAotIY1yL5SyXJRFhCqiIGYCRCj/TkwzUfTDXIyIrNNpavloa/loIGPc3FclCYCUjkxMHwEZJyKQphRvbMRqMJAzinrgie8WVSPqYRjVE8dAmSaO02I7Xm4iIG4a1iw/90n1GnH+TaNSajERYj25774WeDweT5WAeDweT6Pb7ZsidGZ2w+I8nkg+yqlU49KTHE4s8mFBJGRsWFtxeJjpmaAGxBiSLjBn5893XLlx8m3y9+Fm+17b98J9LyKnGL2iFoQx0JAt7g30YBMutFEInqddtdtNEELYG8nDQ7MIHikcR2DPc689UlrkwUE2ePLJQyA60ajHiRWaO5BzPZZqd4BIySQxaVgZIebb8dqmhHcs6nHMW9GkndCJsPxj4FCS5yXnaxnn1QLi8Xi8gHg8Hs9Ap8kIIXo8CLrIWI+goF79BY0rELczuueZIQTPB+K496x/DJEKOTCDwBQjZ5mqs8hDDbRaAl/wgkUIAlYlH6XaC8HW15tVP45bjG5wGxPaFTwO6z6QIdqnRy60TcqVkQ8MwxA1dLsJnxGCWuLh4sjG2MJ0IKLBtWtJ/Mwzh1CD/+NRj+rrEUlZATGSKURgIlTAOTvxlKsKCCy15MNt/tmUiEt9zhfB4/F4qgTE4/F4Vi9eTE39hwiCfRTicIIFPoFl8sjH6J1zdKpQcPr0cnD27DJfXV1AIfgEogE15IPMAMP+foIHBylBPZBzBjoKgqdOtavkw4KMgS7+joy0QIlyjYeGzHOnFsS+hsB5LmocEcRQQLByoe18Tux0WthshqAf2zQvM6vBAOKtrXLB8HGpjISUjpn3U90vfOHQbn1bUxywGHWgk4x6kBk1F+1kakCSJJNGNhnLC9FRD+e6E496uBGPSeSj6odBxEARrWRCLN0AEODxeDxeQDweT1VKVMD5PgvDHis6otPk8oF1ZcGea/6nXmjp0F3H502vivD06SVx6tSyyY2fRj7sIdu8zww2FJCYtIAcZ5FmhAKHaVjO/Usg5sN0/mZray1nTVde5I2MghTHyNyDI2LANIiT/w99EAjTYwKFEIDIynUoSkroX7kCKk1hVlSlYCGAea/k4NFH90BKVbvWox5W5uCkoh5UQ16Yvdj2A0mS2HRFzxUkDENuZPFuiHrQEFU8rBQPM6rFzH7lxTQMl8SFC03weDyeKgHxeDwewXk/CAIjIUZAsiPlA3MgH0fJgvO6Tbtii4ttPjfXYPPzba4fB8vLc8H6+oJYW1s0rx9bPhgj+xDKD7R84PZ2DGmqoC5CIJ4718Z2O3Tf0v1sKMRwR6wo4qNqTqi8cHZrQRCRc864md3UK3tOBRhFIYRhAEIE5KZ/EUH/uedgsLUFDjOXkOzgQO4+8kg3ffrp7h1Mt6J8EMGJRj3qyIvb+p9IFdvxpgpg2A+k2WzomZ90bw/3uygziEgqBZIIlR5Ulg2iUZJPerjHkADmU8SVdGOjWkA8Ho8XEI/H42m2Wj0eRQdciD0oCtHp6DQrnDRSgcOB9lyz6Mr7U5gRhgI559hoRGJuriWWl+eF7uBtzp2RfJiBmKaKbt7sYxxLqAlqYHExQt1R/Ijvmj/RYiVwaSmCArpd60FuqgwpdXsxyTkKxjDQw1CnrgGF4Oa3JMaYvawsIdneHuw99ph+kN0xCVFSUveJJwa7H/jA1syjHo54mHES2+tSzaiHg1sHEmdJYrbkVcSY4I1GhHoAIp5Eb49xaWOKCCURmaHI4kQ9HJwXbP1PSyEupnNzc+DxeDxVAuLxeDwdgAEPwy6Pon2nIeHYrXUZWKrlg6HGPR4EAkyqVZEuRPbSKArE/HzTSAhrNIIp5GO0AGkBoZ2dOBeBukQRR9NskDEcJx+AGiEYP3WqCXoelSJDdpesUmNC84AxhlwPrLvARUSIooA45/b+5VtQ8bj7la/A4Y0bMGPswhP6ly8nN975zq3s6tXejLfWJTNOYGtZNGOceBhqigdAOQ1rMEj0pAiAoUnDssXodzjliib8gVUhILJ4THV7oCA2FMBKwvlcdUNCj8fjBcTj8Xh+9VdV0GiYQvQuF2JfFQsnAsAjFv7IquTDAUvnoJEPzjkIwUsFvbafRsjn51t8cbEDjOFU8uG+/9bWADc3+8dKw+IcwdR2RBGvkA+yx8ysRSqwUZCqhaC7CxZqjITAcWAM0cqcE/2wPUbSnR24+YlP5Nvyzpr+jRvJxjvesXPwsY9tzWxrXUc8TiLlisyY3Ra/ZG+co1SW74ZloiBEyEzdjknDiqLw5OSj+rconpO0fy0rJASHg0YVwDNELgGWE8aW9gBC8Hg8nioB8Xg8vhA9QjwQYdg1O2IhoizkgyYo9gYb4ah8XePu2ITD6AC6iypgLE/PMnUhNgoytXwgmvMApZS0sXGIBwfJsdKwOp1cKkrfFatS0TCKODN9QQqotBuWFYJyFMRMKAROkQfFiqR8JDf6YYdScPDEE7D5yCMzTcUabG6mG+985+726153FbJMTR/1cDxg9uLhghOJhxkTgs5skXEcm6aESkoCxoyARFwPqIAQkYTgqtGI1DDKNf6zHrNupVTohUAENhXLDAtYEAHdf7sWRA4A85KxRXnhQggej8dTJSAej8cTRNFBEIYmCrKHjKVk18yjFtclqWDVDfpGLTapXMFqnriLZIOJkPB2Oy9QN+dOIx/AGJS6tiNsbBzA5uaAsoygLs2mgKWlJgw5qkYFtESFWloEGIjG91xQCtBwXAHRUEk+3OiHfS6TBLZ0FOTGJz85Ewk51GlXz73+9du3XvvajemjHq543PlaDzJjqntUfwmEEUiZmWL0LE2lQuQsCMK8d0ujEcIISEuHXFlZyPR21ZneJU7q9EQKQ5tqN33Uo/q7ojKnl6IgZrLRjyoxxKHodjLGFrN+vw1VeDweLyAej8dDAKYQvcvDcBc575fkI58t5V2v0DxythstNx1ktgak3L28EA+736cZrogAY2g6RfO5uaYpWD+2fDiXseFuWBlcuXKAvV4CdeGc4cJCWPo8VCUfZvBmk7OVFbcxIVREQexvXRsqACpwxc5Ze8rBAK5/+MNw6aGHIN3fh+OgkoQ2P/vZ/hP/+q+bm6973Ybq9WT9Ha4qxOMEaj1c8ZidfFSCRR1IlhkBMWlYUiIKIfK/651O0/17TpwzpTvbp0tL8+ny8kK2urok19aW1Pr6smo2Q/ujTb1b1xhRVCNSsXB8tBEBsS0RlweDwRxU4fF4vIB4PB7PEkAWRtEeN9vxCtEFDR1dAE6g4YVsoBskMQyfkHsdAWCpQNpddGIRBWma7t7HlQ8zLGgHkUIjICYKIqWCOjAGaNKwOEcrVGOlh3Pky8sRCOF2vB4ZBZk4AOKIBZBGSkVKSXu8HP1wz5dKQf/gAK5oCfnc//4v3PjiF4GSBCYiTWHrmWfosbe8JX7sn/5pe/v979/M4jiznyMflrricQK1HrXEw4wKandEp5J+xvFAxnEqs4yQc7MbVoM1m0a2Rfl80s+lLlLXo5m1Wm3VarVofr6jdBQEdO8c0q+BhqYsmsfy7EBFJEQBQA2DifJCdCGqC9E9Ho8XEI/H48Ff/VVpeoEERkKE2EdEZRcgZrLREFc+sAQrZhsVYU7ExFnbkZsuZIeBGGMYRQHrdOzOU5PLR0VaFLMOsr09wK9+tctMY8I6IOZNCSEI2FHygQDEKrbkLWOjIFWfeWwH7rK4pWlKWSZJKXLrP8rPpZ4TKfMRxzHs6pqQL/3P/8Cj//ZvcOkjH4H9K1dA9nrmfsOGiVKa3h5wcO0aXNG1I5997Wvhy//zP+rqe94zGDz77GE2GKRSKVL1Uq6oGHCCUQ8gAJxePKbriG5QaZoWUZBMEjE2bCLZQC0a5d+BGo1QhWGogiAExhhwzlUURdTptGhxcQ5XV+ep2Qxn8V0q+vmQ/TTKiu5kGYGCiDoZwMIWQABVeDweLyAej8djtuIVUbSfp2EVDQmptCVv6TmVO4LrgdxcXx6IyGz0w0VKlQ+lyEnBsrPdLSvgnU6DRZGoFflgrOKVQkKkJLx0aR+vXevboulJyK+PIjayeRyi2wEbi+/A2Opqg4qtai1QiMKk0LgoARmrSDJK04ykJHv+KBHJlIJEj1QPew9lROTxx+Hpt74VPvPgg/DJv/s7+NQ//zM8+q//Cg/r2YxH/+Ef4PE3vAFufuYzNLh+PYV+f0CHhz2w93eiXxOs108k6kEAaMcs062m6g2iVCoHgzhvTJhlgJwLpsXCSIiRjELAkcIwUEEglD1WiLmREGUkRKdmga4PMedN813QGVVf0aZi6QHj/gwRkSmihYzzBXzggQiq8Hg8XkA8Ho+nCdAPGw3TD2QPhegftQOW+7/9qOHFsPIx8to8XUhDOa58ANnbBgE3xbkYReFxIx/uNawYsLcX86ee2sPd3Zhq9NtgQiAwhs7x24LiHGN65rpuBBsNUa7ZcBfJlSlDZkywUKc4TvVIQMpMkcGJgFj5kBJSPUa+nVJ5TcjhxgbsPfUUbH/5y3mE5ODyZUi6XVDDqAhRkiRGPsx72iJljRqzyCewnFDUg4YDp46cTFljgQDonld0RY9TEz1KcxXkeWf0RqMJUdQs6qCYCkNBQggY0XLcSAe12w3Q21WjadzJOasb9XBviZN+/yFH/RnOySBYyADaUIXH4/EC4vF4PB2AWMzPH+jR541GnxXbbZK7iqzY9cou7qvkwz4nKaUZoJRyIyA59jFjDIIgMHUgExQzV0Y+3IUWWDm4dGlPPP30Pvb7cvI6dI4oBI6SD6yQIN5qmWL0BlVl67hCUi0e1aRpBoNBksuBUjQq9SodJx/Oe1ZAkKYJ9no96nYPjUg6Rd1UdcuTinqUBbbmPao5fo0FWglxzrNd0ZN8S16lgAlhoiCNXEAQOXCOoI8R55xGpTAiMgrDUEtIno4Fpoh9OtAKc9WLVLy5uv3YjKoysbYEWIiVGvu5PB6PFxCPx+PrQLLw3nt7wfr6QKysDLDRCNy1TzktqzJC4sqHA6WphCxThlFpQnZWREhC8LxRm56nkQ80gzHAUoSG4liyxx/f5VevHlJ1c0K3r4lyazaYKx8OjHPgOg0rFyq3G3oBKTVVhCAvQj846Kteb2B+3/JvqorohxnmcYXsHE2WKer3+3n0w7yPuwAnulvEA2cV9Zi2MSFW/w6Z7PcHRkBkmhIxxk3KoSlGByEaJMSwsz1jDBDzt7GjlI5lakJCaLebJhICYSimsA/Cipew9D2UHmSpvhcSYmAEJJOyDR6Px+MFxOPxjEOcPx+H6+uJFhDFl5YCMClQ5Y2VbteCYC35KB1DpZSpVwApFRlGyIfUI1EKEgAmw1CgEHwK+bDnOJEKzc2bff75z2/xzc0eSamOXEzGsaLBQELRZNHpBF9hLTgsRp+bC6g6P8lGQ46/UNdSgEYOBoN+OcXNykc2Qj4mRikFcdyDw8ND2t3twojfCjUnnG7lCsLMoh6zbExYcblSRRpWliQKEPNidIiiBjUaLamfAeeMGMOqz2VmI+iq2cwL08H2zTmegKDdMhtd+eCcQRQNPw8AqJKIVCkLAgRKqfmUsTny6w6Px+MFxOPxjCM4f74bnjrVD1ZWYrawEHC97WcegahqOFhTPgz5Qt8UTJvh1oGUdmoaZBn0leIJY4KCQEwjH+6LDDX2+eXLXfGFL+ywra2YlCKogJFG14xAkkhnoVYtH3ar4ihiOgrSLK9AnRSrqTt/57tg7e8f0uFhn+I4/y7SyFwhIODsODYxREa8BnBwcEh7e10T/agVDSCauXxUF77fXeJBAIhmcsC8FD2Ns34/TuM4y7fkFULwKIogitqKsaYCYCOFkai8WUOeqgVWQqJIwDGxQo1l+Wi1Ijp/fpXuu+8UnDu3RgsLbYWIpFHV9TDmHowAFlLEuS5ACFV4PB4vIB6Px7PA2F6wutoLlpZisbCgTDdyNjfXAsbYqIKKmvJhoGLXphSKXZvKERClR6ZHqhTEUkJMhCkiV0EgppUPCxpun0gopcInn9zlX/ziHrt5M7Y7SbngQCvRxkYflKIa8mFAYAx0RCkEIRhBCaXIScmaCi0fAzCS0O0eqCRJpZQqU8ot8K8X+TARlW63q+VrT48DKFOWOTPdIfEwo0IQECZhWvGo35QQR0glOrfLzG5Y2WCQyCRRjDFgYRiY3bAoCFqkVIAAWLmrmT3GOadhKlaDTDpW3SgI0e3IhYaZ2TwNAk7r64tqdXVZrq2tqjNnVo2EgN7+VzLG1JhMLGSME1FbEXX6L3xhAyrxeDxeQDwej+dlL0vCVms/mJ8/1MXoPdZum47kbdMUEDXuoruufNhjRkDICIhSUtmFValeIS1ShhQiSsa44pyba2vJx8iPVHEwTaWWkD367Gd36MqVQ9KyUYRmIJ/160rXimRPP70HNeXDHtO/ITed1KvSoJSUCqah6CmCe3sHoNOklJYGs9uSUsc0Gykl9fs92t/f1+Kxr3Z2urmQWIgIAcp1MO6Ce3rGi8fU8uHed2byMRkmDauf9vtJalL7lAIehsx0RocgaCiAkAAYlu5Hjowo+5xzAVpC0AiIELyufBiYHcM6KSiEpqXa7TY1mw3odNqgO7IzLSJ46tQCcc4kESgi9362aL2VIZralAiq8Hg8XkA8Ho8HEVWwsHBTtNvbvNM5ZM0mZ61WS0tIixVFrmiYQj4KAckgjhObhlWu/cjclCErIIxhLflArPWZTIQDtGBkH//4daXrQnBjw6QcxagbF8ITT+zKRx+9adKvjiEfYGBhyPjysu1e7aZd2UL0+jiRhrwI3QjI1taeMnO/3wcps4kX0UqpfDetg4N90FEP2N7epa2tXcgyOSoNCRHLv+1Mox6OIMy01mP2HdFrSJFNw5IyyXRKm5aQLEtT4EKgaDbzviAEEIBSCIaq7vZEVkCGW/OaXiJ6risfFjTYudkM9f1C4JyZA8AYA3N/0wTx1KkVWF/PJcTcyfk7aKMpkURcSLKsAx6PZxxeQDwej4c1GpsiinaCRmOPNxqZWYiwdrtlUrGQMYbgUks+bL2Cyltxp2lCSin7v7nS2a0JAZAYY2QjIFPIBx5Vr6LMm2dAN270skceua4+9KGr8P73X6YPfOCK+tjHrtOtW30gmkQ+MB/ueYwhX1wM807qJUgpKmZVu7C54nRldlfa3t6XW1vbtLOzbaIYMBgMIMsyKL2Pmc0ovrtpj97X4tHV4rENOzu7+jvvKH0fW3Tufj7b3BFnLB+ueMwq6kEnH/WwNRFUcV6ehmWjIKARYYgiigQbNiDk6H5+Rz6UeYzISAiRF4ubbasRcQJhra4D4ZwZ+VBBEBBjzIpPfl8tR2hqw9bWlmFlZc68TqMbTBoBmU8QfQTE4/GAAI/H4xnD/ItedLP33HO3tHzs6NGnJJmjViuDJGnm26/qxVLVIn6iaIhd3Jn7xHGm763yCEdR/yFL3dChmAsJYaiUnIF8/H/snYeS40a6pc/5MwGS5drLjp+d0fXervfe20fY59hw+1rrN8z6673MatQjdXd1dVXRAZlnEyQymIFgVRelXo9PcW4CIECySroR9c2ff+b+DRKBaDGKpKltG714sWAChzWc86b7CKibhmX3709iWn2ruDlLmb6KeGSipNClqzB1vTbL5UrHxwukStbmj8eq8nDOycyAXHoKAU3TIN2vJCpMvSSbZvamaW/6Y5yJPF3H3oR8KIH9fHXxKPmfLx7F1DHhNqQQm6argHSZhVRs7ASknk7RhsBCxKE+KP//o+wJMTNsV9Kq8yOHrkTGHO8dqqqG937wM2YJqe3evZNOWpVkV5eXC0oob4GZV9MchbY90VakAkZGRsYKyMjIyMgNtPXp6RddFcTV9SurKuumhHA2m1q34ZkZD5CPGyskXK0aLJdLNU0TY1SIEWH/XhWMZhTJ/1nygXxNEiVqG5Tc9P6vkw8W05Q2v8uuGX2AYlSXKGHIoY3d2laSJIBII66vV6mScZEqO8/09Onn8fPPv0jnz/HFF9t0x59//izluT777It034tu6tZQPoYwxZFgAl8RDeXjDa1wpf+N8pEoBYE3VkakdXt93QlI2yyXIom6rlFVFTwJ7uvvH+6ZAyCSFr136h6sKvvSCwKQ7ERmEzOHglJ2lCSESUJSJeT+cJU6AkxxEThuzE5eARVuYmRkZBSQkZGREZKyo6PzejZ75iaTF+ZcsLr2bjqdpOszTiYVSGLIAfLRobZtsVyu2DVKhxBDWf0YPkNaJP+nyge79AKC/Efd63+WDPdJCocysl0Na4Lp1A3/WI1tK0iHVz2G8iEplj0UCYQQNZ+vulWskmi8jE+fPk8y8qxL/OyzZ0lKNlOtugrXvl6PjPrkpYxTzPDlUc+brnocLh5fvddj+B7KYxaN8nmpOEET1+vlOknIerGIsW3hqwp1ijeDDT5wKB/K10jIOVNVuY29ZKSD+ojyCljw3nLflfYtA+ycdc3pnYTYw4enN/RcnbTSrP35n69wGyMjI6OAjIyMjLijo2c2nb70k8lLer+kc2ZJPJKE1Om16d7qxwHyQUBdbD5fYblcd1WQwYo6JVIXEsqPv6YywS6H7VGiLiRFieUyqpkDqz2lfAx/t95OT2skNFx1KkZ9lX00oqTYVz+E/SjRSYb6vVi642FfyG0b/hHY7ShP4lB0N/HgV9+Y8H9T1WMPAnjLa0KMXTP6qpnPm2a1AoGNgNTOwWUHH1ZVijFujymzThy6GKQ7y0dJ3nwwwf50uP9IDrvP0vFx15h+otR7MvT/CEyj2VF49szjNkZGRkYBGRkZGbFuKd7Z7HkSkOfm/RXNaFXlbVsFmTIdfxX5QD5N8sH5vNs4bx1DiMIeiiV6i2VHSecshTd+3gHykc8NkO32Hcz3HSQfvFk+8jQs2sOHEw1eUth4gL7CPhqKSmyf1ZveaXw49aoLv4R84E2Jx6DacDg6WD4OqZwMqhwa/I6Hr63DcjlfXV83q/k8xhDgzTYC4klYKSEkUMpHKSNAuWjDl+4lIrmVGbKUnWFlByKJqqq7JXo7CQE5fP9piHHWTqdT3MbIyMgoICMjIyMn7757UaU+EJf6QLoQEL13bjsVq2YKSH5J+cjXiBgjrq4W7Kb+NE2L/ai7T10AYjarUwXhhN2eBGmjNP+1r92ztMs469rY8SXlYzP0AkJtBkg6VD5e3/vSr4bFfp6+yp3Ms4BIX3q/vqjEm9xpvMBSHEnHngOrHrfJxwHaQJEmIsdAWUzRMJCTNqPlsQsQCYgo3wNgkQxz9ovHYUJ30zMkW4Wwaq6ulklCQrNcghIqM9RZ9vpkhhISuzHfZMZbpSPnJswGHzhogi9X4HLOxdlsgrRfkGazejADspbZrHFugpGRkXEVrJGRkZHXUZ2cfF7NZi98XV9E5xrFWKOqfNcD4mezyfr6ejHYvVspr5+a1aVksVjx+voak8kEzrlNSmIMCCEowfS5rtudPVVh3FtvVdXXvubSru1g28Y27WK++r3fu24++uga6fx2+dh/TlIEaIAFiUoA4BuSj4zcbOZ4dlbr+fMlJIGkpKIP5HC0G9kNh0vH62HCmdFIGl6PBp9zm3yoPKZY9mr3r5QiSwHaPVv4ZH4mXybyncIGFR8mlXKcx/J+gPn6wQjgHassIrCOy1QSvLpqlsfHvp5OuekFIbGWEMgsDYjs37ZLfz2SsPyZpH3JPqJyk8ku6KJSeEh0sDin915dZfTk5Ajz+Rq756ogzWBWY2RkZBSQkZGRkddRV9VznwSka0SncwtIdV8FqUKSkO5Y63VbVhruVPkYwBhjEpB5N70rpveW2RSk5b052LZtSgMmjo+nmz1J3nln6j/4oK6/8Q1Xn53Rk8BqFZrvfvfo+td+bbr4j//xXPN5e9fKR0mehhUBExAjALtFPnhABSh/rqtr65rRmyQg7C9Sgr7ibui5+fywXcbvhiOZYym4Ae07I1hc4W4UpN15vgblZ/KTPaRtxxtEREwRlK9CQj7UXs8Sd6OKHpd8LErqxpjCXinAhCDcjlDA2ytTItmGEJapCrJadYJ/dORmdY26l5BWgvKqWL14aLAxYZSgsoJRfqR0aDkNRMmgCkIC/WfCOXOTSTcVa4Zu35i2jUgQ8FE6amKcZVXCyMjIKCAjIyMjNzFx7qXLfSB1/Sq27T2Y0ToJSQJik4kPSUDuJB/52k0sFmt3eXkl730gTXVdgzSG0LBp1livm7wSV5KQSScgaTdmp5MTBu9J7+GPj216eur8vXven576q3//75/H8/P1IfIBEgZESl4AIWET8s3IR75mpjQNq2qqytA0sZcthSRRuSKCAynn6b9p+bAsIGbccKt0ZKEQBLCsSqiocAggU7RNB9W/Ovjo4ncpgOUMn+JKFo/NEZAvZUURCWhQ8dBOOsD8wfkBgEBMAQkREkVBm+MogOTmbPd+JTqwx4QMJFdhkUqCl5dHqQriqskEm/0FzdAAiNgRC/FQf275nhh1qHyUMEaZFAjopj1IShEBSVWV53Q60WRSsW1X2PVSTdQ0HiMjI6OAjIyMjLyWb31rUT1//tRNpy9cVV1E8n2aGb13rCpvXSWEXAJ4vXyYEbdASbi8vLZ+x/M4mx3BOeN6veJyuUxZcTLZbI7A09NK9+65tq6JEBjXa8QYuzC97Ny7706PnaMkXP2rf/VMqbH3kD1LCMi2Z0SvH29SPvLojo8rOzmpkiSt2N8QmiZGCUZ+pcbxwzf7e418mFmufpSbnhTy0I+ihDyFillC0EdEfy7uVKJ/bSgwzIWzbmQpJhSxvUhkC0Fk7EaJIHrxyL0n28sguPMVCMoO0we5/EIxcntuILKsREIiIBKOYoSgfA3amQwgqT/A3YlGrmMIy/Xl5Woxm1WT2cxcVaGeTDAB0AK7KghKy8qHyvIRD5aP8r62jQghUhLNUL6mFBYiEntfpnNuIx+zWd3tPcOESCegaoDpDwAHoMVNjIyMjAIyMjIyQjK++s3ffOZmsxfWLcfr3JohzNJo1klIXdfp2CmEgAED+cBdYAhyr15dUYqWxEPOObRt4NXVNbvx+NihqrymUxe8J2Jku1zCzJBbR+q67mL+8ePJ0U/91Fmcz8P1v//3z9A0ek1TenHIaABSXATaQR9If/Dl5SO/4CYTs3v36k5A0JNkKqD4vEOXj2UfvXn5MDMii4IgK8Qjy4elQMz3wID+ylA0uHufXB1BhjAV9RCCuWE8n3LQ9ULtnAIZQYoQorYjSTjkBwCU8iGAhHZiIhEUhFgsGx37EdxeNwpZSFIY2QtJ/5Zx3xK3uk0AyDZl1e2Ovnz16mieBMTXNSozVM6hkhCt1+NELCWkX6yB0kYeIB0uH5mmaW0rIIGAL6sgZb8Jiqlg0cxYVZ2ATEFeFt+rjt5Pj+8iICMjI6OAjIyMjNR1/cJms2dW1+dwboEYs4B0cemYCuHmyoLZ6/t3WfQgh9Dy4uKqq3hsjCLGiPV6rQTTeQrlvQWSbdMAbVvMajJkCZnNZjZ59KieJglpX75sVr/2ay8h6S6N5EoZroQVJZkZD5QPDa9xd0o4B3fv3qQlr5Q/u21jAuYcbuGARvVDxEMcfmMzc3k9pJgrFymFeORjCJGlB4mloIiFaAyulxWPPllTQAoiS/mAdk8MfssqO6ijECG1ilsBERBpsPx8ngmWIFEIKnr5kMjcG6JIUhQEIlI0QjIggtv3IWS9KYVuhKLKrvhbydIpBZJrxLjpBZlPJt00LMIMNp3CA2jMAO+BonwT+8/I8sGmCYfuAVLC9bpNaSwmyF1NJ0XFMsBlAzz7FbFUVZ7OESEIpEVghhjd6s/8GYd/+S9xKyMjI6OAjIyMjDSz2WV1dPS8m4ZlVXUZm+YBSaCTgarqhMBumnp1F/no7ynvE6WITkDKZ/v9PkSySyQ3bgKy3McPTdN0voLVaoXZdOomDx9O65/8ybP2889X4Yc/XLxOPvK5AXKABclARgy52wpbN8sHoG5wqVeFx8deV1cNSMZOQEKIqCo7VDxIwpgApLu6h7Im9DJBQIAZE0aiX+429rKQ6xBSLw4s+jpK0cANokFQxb1E+bndKEOHUFQ88lExJauEIARkZcntLRFCUFTLiBAl9lLk8huIAgXkRwUVVhNBKh8zN6OTm2NQkaIisX0tjaYsI+LmGIiU8DqGFS+Sjcgl2na5PD+f+iQhdA6+bbfiYQZMp7BeQiIAyz0gMYohxC53mI5322txIyBN03IyEQFy0ICu/Hx/LIByzjZVSjMHIBKgABfIyl1dGUZGRkYBGRkZGXkdJ++9d9U+ffrMpUZ0VtUFyEAzGokUwjlDN2YOlY+b4Y3nJG4jxtgJyEZGppOJmzx+fJRWzDqLL1+utVqF2+Wj2KWdNJJOQN5ag6V8HFr5YD4vXnezmbPU0xKSgKifhtb1gWA63ZweUvEgwP57I1dtbqpyZHFQPwK9Bgg0o4Ew9GMUAMpKychPFFWHYUWDQr6nfBZkiihKGFQ/RGEDMejxEPrzTcpfDHhTI36E0G4rIIiS8m9eIFxWH1HoIaHNlT4QOiKhcpf8XjJSiEj0EbKMyIAgqL1pJ0Dub9ovaUmuYLaMq9V6/vz51Ej62QzBObTeA2dncCcnsHROEnFn4UTbOkjeSOv3zoHIw5bjDWGzMASTgFiMUWZOu/1cwBQNlgUmACNNZkbnrGiWryJQ22JhGBkZGQVkZGRk5E59IL/1W5sKiJ9MzqNzK8U4BQmYkWaGoXyQB8kHd5HypRJSANTPa5dizHe+VkQWyyWD991+Icf4+OM5PvroEtJAPvZARgIwwEK5nwOJQ+QjXxzKR4be0+7fn4TPPpsjoU5Atn0gFciDNiXs5YMupZQPQpZPdtIh9nKRKxObc+urHtwEjBBhgFTIAwBRJoEoG80por+vC9mNhWgQKCVlb/M5y6V5ExLyliOx/3xkNJAPgEUFBAFRQREtBFG5SQKg5cl4AgWCWTaELB/IryFCEJmyfUrMlQ5lASllRFEg3ea5iBLdofpRCG6TsiSwai4vJ9cS3XS6FcvJBC4EQNpICPN0LImxaVy7WHiL8ah2Lpi0ghSjhHJX87vAVIW05XLZ7e3RdwCV/5Gj3IMEyL8E0jln8N4V9zmZufb62mNkZGQUkJGRkZG79oH4NA3L+v1A1DRTdJDsMlhqtwtxGze/zL33MiFlCclBKRI3IQkrycLZ2dR94xsnlqZhablsh5WPknIlLCNdAKBEBOhIHtpsfpN8gKQB8mdnVeO9IQTlRvS8EhYkHIKRlNEMJsWAKCEMpkEJsEgZAYgwJmwbw+Z8e3+EsqykgCjlRfm8qFxI/TmYhSQ/VwgCgYFkEFmQrJje1ZH1p3S5rGUEB9UEZcESlAgQWkQERewMg5tDTwOEwnKyQ6GUkLg5Zn9OZPnI5zFXQqgUKBoYRdEim3L5tPxmHXaLfGQINABWMlsyhGnqB5m28zlAAt7v+jFihDs+Brtr67VC27poNkvSICN9vVpdWbfHTr+Rp0iW+i7cDBeLJmVl6/U6VlVtReO7pKGE7KaC2QaiR9tKjOe77xIffYSRkZFRQEZGRkZeyySEF+7o6JmbTp93fSBhsbiP3V+RIoCD5CNlAA1AAHTjvSTVti1iDGzbmKJDNqduq8rpnXeOfAo//PDVbfIBJoDI3IhuxjwN6hD56IJb5COP/vjY29nZZjUsAegqIJIOko+yD6PDKEYzsG9XiN1AOGVPAROgEQZk+QBJWERCMrGQlp04ULtzy63Ixc7l+bXdOVRUO/pR4k4wQCELiYjSUpV7PIRsHCyKSxpaY1/oSLEIKQUiAJVWIUQKBkKD7dOLcxESQOXHSunIMtLLSQQUDJDS6GSx6IXJ8ir1nxEAMMW64WYizVYGLKJ0FEOoEaORBNoW4cULKEbEFNU17OwM9vgxUVWEtF2dLsZpWK9PcHGxtKdPr62rsqX/xmLbSigM66YqTdtGXl4u7N69tc1mAc55lSutSVA/MjemD7y7PzCYkU1D3IWRkZFRQEZGRkb4/e/PL/7Tf/rcTSbnrKqXAt5WjLELAIEUgC8tH+ixlHDTvZLQtjEloGmUAsR45yV+ZcZw//7Uvva1E//06RxFFWSPGIgADIiONCdZJEP5x9ZN8kEk7igfGdZ1uRwv4mq1aUR3ZnaIeEhibhgnu9AIgCBNZRWEucph7AAM3L0uwER0WNmroRRkKZH64w0sJWQgGlb0i5ik8hlCZR+HSpUAy8u5KSMbQln9Kq73rzECiBKV2zp6hD3emi9w0O0vKD9RVkVICELMlQ9AkaSTEAykQQ1AbV8DYlE1yFh/zW6v3jUEljRbMsYZJMsSQ2AjHvz2t+G+8x1Ub78Nnp4C3gPO5elSLrZtrevrmV1eHicJWdkf/MG1+63feqmLizW2YgT1yd+V3htms7rb2Vx17dumadXFOVdKUywa0btR5GAn/uI9U9L7GO7KyMjIKCAjIyMjnE5fdo3oVlXPFeN1bFunEKI6KSCJ13OrfLCI9okKSbRtu8lqFbhegyFA3uMuMKHJxMW3357p8eMpP/306ib5KE4FwEA6AKFsRH8D8pGROUeXBKTNF5omqG3zSli3SUcWhm0oE2ARIkyGXhw6TGAESNBy9YJ9RSMCpv5YBCUYBr0ixeemCGLZbJ5H5eNNpP5cYPF8wUA8Bqi/zvKW8lDa29Ldi2IfML/M4n2ziNy6NBhhRbsDVfTT5OZ0EqEvsgQSjsIaoAhFgjHuX4wsy4ciQMMNbKV3bdJcZjPF6CWRx8fwP/mTmPz0T6P65jdRPX4Mm07B0lcLAdS9e1sRSRt06v33p3zvvZn9x//4ouuHogSg8DqSSOJR3b9/4o6PZzCzRYy+XSxE72XeM//mBs8iZveIEYwxKgEpv2ZsW+L/W0ZGRgwjIyMjB1KdnHzuJ5MvSH6mEF7G9brtorYNuAtmGDBcHUpGAjfIB7shxqim6QSk4XIZOwmBhLtC5xjTH/rh/feP5ZzdIh/lcrwkYL2NMO5pOGf+fofIB5nDlK6Z2GM6dUgoRjXrddgnHjlRsgi5ALg0+gBVgSmQj9ycuy6ivAAvUwWiErVJRApjfqaK3UgUx/JCl829LsXHzXHc3gN1Y71NrFql61IVU8I2PgJOhKEPS88s5eM16KYoBSrPd70RXbAZb1mBVnv+cxPK75ePyZTy3wHhIuCD8u9SdRq9kE2MAbp9HeQ46A0Zwu2ja5gtSXZp7eFDTP/CX8DJX/pLOPnZn8VREpD69BRVXcN7f1Pop1PagweVvvWto/bnf/4s/vk//xZ+7McemPdmAFyKAUxj917eeV/R+2lLHoflchIvL03zOdj3JuWwC3YoRqVEdNnZm8E5NgBxV0ZGRkYBGRkZGZl+/evPrKo+pfQDxfg0rFabJUIRQvzy8tHD3JFAGhPYwfJcAtfrBkl8sFjoEAHJaDarUgVkhrQB4C3yQe2W46UBDmXfsKRCPoqf5Y7yYUbU9QTHxyc4OTnVdDrl8XFlSY6QUIwIy2WQhFI8RDCLRSD6MW6kIzAFSOdZFuCjKb9WZUHZyEmWDBTC0T2TxQTyyvd31wvRCMrpzrfPCahEOGxjJJhDgRKwyR6t+NIoj9oFGlRBbn50f7vRUEgG9D/ToBZlGxmRvABHQga0TmizXEQJN6EbfhGFObUCVubcwn396+3sr/01nf6JP4Hj730PaY+bjXhUVbVXPJxz5fE2s5nx7bcn8cd+7CT+6q8+0ve+91DOVbkPyyRgvY7tem3LxaJezufT5dXVZPXFFz68fEmsVjLgRgmhFCyEYG0bWVRyAMhmsxZ3ZWRkZJyCNTIyMkIyvPg3/+a/M8b/jrZ9GpbLR2E+bwXoq8pHl3yNt2wCYkhsBWTN9NlYLh1CIMxwV+Qc4v37tZ48mfL8fLF3Dk++KAWSYP9TROTWAJBfRT6Ojo50dHSsqqqZQIzRzWYre++9EPvNEsN6FaKijM7ykrcxpT+22I8CLE+HiuzOZXmlq00Mm/Oo3OdBSjKxaCjX5sw2x5CV/Rv5GOh/biL/fORgD5K773P3lcVjcMLiCxACYExB36pCIjvjZmAXQvkZCANyuWPvqySY53CVXSsQZEJrYEswAtr/jctH+sTh6lhlMwywTv9tYPpn/gxmP/Mzmr73Hl1dl4vQ5bH0l+G4i3OMjx9X+OCD47hYmC4vPX/4wyuLsYXUxuVS7atXsUnjunOJ1YpaLte+qqJPAqPOaKrKDX+uKMlilGuaxocQBeTV62DkusLIyMgoICMjIyMHYovF59a2n6FpPg2LxbthvT7mYfKBm+SjlAwBjHtWuyWAvgdkjfm8sevrOjYNlfdBuGsvSKo2xFQFsQ8/vOyqKcMbhoUQAq5v6I79H1q73bQPkQ9ArOs6ycdJnM2OOgGBJQBxNptV6X/hbn/7t7/AYtGGxTK0bUtXm5O2YhABJ4jiVi5i3+fRnQOybsxN5CBNQl7JqujpQCkfJomRMg2Eox9BqJTGDG/1gzctHhkNDwgyj5bCTQQCEhwFFnUGYVcp4c5DoJu+NFN0k6GKm6GQFCODiY0TGtvtVsObXEwpzPKRR0kYkno4pr/8y9M05cpN3n+ffjIBSeSU3CQhw5hZJyE+fvDBUfvsmdPFRe2S2BvQRolJOurQtmaTCWfHx9F1Gx+Sja1WXXUurszq1jmHHvXGWsXY1k0TKkARPWRDMqKqhJGRkVFARkZGRg6hPT+/wHL5GVarTkKeAzg6UD54m3zkkoLDBkVsMRKuv4cxSsvlutul2S4vp1wuqemUIHFXYl27+OBBrZOTii9etENRKNdW4vYlR8BS4msa7HVbsznMDNPpEWazKSaTWXeen6Vzrnry5P7qwYNZXCwu1bahbVqwrlzet2Mz7ioeFiEDsYmQ0o/oj5GFA2R+RpBJ2slIFyFP8Sq73HmwMAxMRXrD4jE4MTNk8TA65GOR/Q+lXZ+IukSgPzZkCRGA3WsoEYYucpukyAsrJ6zT2ED5MiL2IJD9kagEioJMCcnUbP4gycfR7P33vZ/NmCj+0yHyKOlOApLDycTwzjvk975nqz/8w4offbT2ZAvnIKByVVVZXaOaTum9hwfMYmyTnLTdhWV6vjUjEupjTQOt1wwx1kFqYoxrki1ICRBGRkZGARkZGRk5hMf/+B+vP/3n//zcmT13VXUeF4v3ALg3JR/l8qRudx22PablZ1arTkCWvLqa2dWVi6enhBnujBmU9t1QkhCeny8haV91hpJIipKBNPSoA7BDVroCE2bGyWSCqprQOUrl9tuJo6OJvfPOvfiDH3QCorZZBWLqsRMPg8AIOTCLxjZQPzJPsVKWEQr5WIxALyJgl2wMhLpxM4gqerGFm2F/h/p30P5/4cqvvamqB2HmtqGBtP6Y+UdA0FZhpeGqWHETQrAuEoSIiER/DN0sV7pBqAxsHLjysjXFACh/KEoCnV+iPl6xPkEM8UjL8ynaZdaF4dK87lvfOj3+uZ+7d/SNb0yr42NLvLb6kZF0q4SQBE9OGL/+dRe//W1rP/qoats2mnP9lvhpyNOoYnTRTGhbYD43L8GHIMxmDM4hItG20nrtkqBM2hBO1yFcR2AJoDFyZa9eNRgZGRmb0EdGRkYOZTKdnleTyUtf1+c0Wx0sH4MzpgwxQEbSdQFoO/kg8jSsxWLFy8uVXV5GWywOWw0roenUKTWiF3t6lPKRRxFQXwFx5b15D4W7ygc6vPesKsc0GsnirTaB9849eXKaf4dhtekDccHk80pU0VSLqLpEgxeRV7naHEeokm1e92Aa+4DwIn03wrj5xzgABNlrBVFAlCG3sa0Vwsz6cdCBXjxO8qvLB7ef5Zzfxjy8q1D5Gn5zrdqOVqXj7WveV/092+Tz7llLYSEyIAEQt8H9VRI5cO1lKy+uWdhWRIZs/NHJK569+yzOvvEy1u+/1PS9izh53Miq3b0FznH6Mz/z4Oi73z2q7t1zCdw1ZlYe33zuPapHj+C/+U2Ge/e6Tc99l6ZpXLtccn19jeXlpS2vr91iPq/ni8UsndfNixem83Pi4gJcLMCmAdL94fLSrebz40UIZ02MkyjJnFsRaMJsFjEyMjIKyMjIyMih1EdHr6rj45c+SYh5f31w5aO4hzftKM4EAOvDRHG7IAmr1Qrz+dIuLrpekIgQcAiqKtPpaYU07pWPEokG5PuEYmWjO8tHgmZG51waQQBWPCIkzOgfPDjB0VGFRFwum6AWsV+hqpcNJ8JFwqdUXdQF8N1YSEed4ruAdCnGxNY9NmAXIMsHkM9R/p/iX1+WD4KbYxQhmCWEGIjIl5EQAaV80G0ko4u3FN/H+SLdNY+qG/tUvr/ex23iN+LhUsiimgLiUAgEDy6duPYpBFQKhUA21fHpcnLvrbmfvjVvdbJugm+i6oX86UpuKpAApOI5941vnB6nRvHZ229XVV133nqjZAyvl+NNIpLjj49RvfMO9PAhmvUazWqFdZ/VYtEJCBYvX3Jxfm5pdItXr/wyje3nn7N9+hRd4tOnit358+dVJyDrpjluQvAbASEXKavZyUnEyMjIKCAjIyMjh3L6gx+s6un0ZTWbnVtVvQKpwysft8sHCm7acRzrdZMEZMGLi5W7uAi2XAoS7oxzptnMazLxN8oH2SUawITjYN6LEneWj/79LMFSAIrPFUk7O5vx4cNjJLRaNaENiICLlN8F/VK58KIqGXw01rvKB90mRrNtWASkFcunbkcU8pEoXsMmZXXDCtHYFxYjid2ILndEQomxr3yYg7d+qdnNeUopIGV8hSpLieuXpbXiuRRmCWGOAeStMsTBCw6bysfSC0sKEQWic+v69N56eu9J6+p7TQg+hIC2Sxu4auN0EW0WRSulBWac/uiPns26qVdHR+42yRjmptfL8/Kar2vUDx6gev99gETsvlsvIs1yuT3ukq/N51hfXWH14oXWn36K5uOP1Xz4IduPP0ZIlZG4XjuFAMUYAKxILr00P/2X/3KNkZGRUUBGRkZGDoX/7J+FWZKPajI595PJc5IB5Ovlw+zNyUeHEqkCgsvLuZ2fN+7yUghBuCMyYycgODry++SIifJ7UTICNtz0/HXywUI+8sPG4VSlXZ8CJpPKvf32KRJat21smlaQz3t7BGzkoxKRkysfHoCD0YEwI/dUOvbJQUr+B/vkoxCLoYTkY1pK8ZrtRuvNg+DdpmJJm5SQWT5SXE5R+bCdZOS4/nqWlpT+fHucKx5GB5ptj9PIvVWQWzcUiR5celmXNYrZfJHOrfzJvVV9+gT19Mycc4oCBKYghohWqtawaQBMhXrx0aPpLE29mj565H1VDaWiHHNuE5JbKyLmXLfR6GZHddY1MooRoW03AlImNM02bcvQnV9cIJyfI1xdMbZt91yk2Qpkk8a1M7v2IcwJBIyMjIwCMjIyMvJl8HV94Y+Ozv10+pzOLUD+r5WPTNu2vLqa88WLhTs/bw/qBSHBujZMJgYSJQN5ECTmvngr7o2S+qbum54voQBRillKrB/LaUr03rnHj7d9IDFiuyV6dELf30H5LhHbUcAmIIwZGpkloAj7gIPejkwWhXxciAf3CobBpZhtjofnA+EpJOQ2+RhAspAPl8YsHS5fy1KR74PfZHc9S0kpH3lMyRLSS5cNqiDCLcjDVpVsUYkrJwT0tPB+4Y4fLPzRk+jrE9cvOhBT8pYypFDXZuZd3cJVZd+I+9rXjqfvv981nruhdAzHYfa/dnulxE+n8Gdn4GwG9v/uMpLQiUUWj7ZI6BICUxC1ofWz2cqdnjasqpbA3Jy7rup6jpGRkVFARkZGRr4srKp5naogLvWBuLo+f+PykblNPkhAiW41rIuLa/fFF0v/8mVg0+AuEKBVFVlVtq/yUcJtnPWvWTcUhZgIWYqLgOXNAHe7l3MTdMSolDisRhA7ZGbu/v1jHB/X6JgvF1Jkv2O5j924FQ7fjerfIrN3GlROrxdEPgfIIuBmtGHVo3zPfG7Wj2X6ewYZ9prsKRjdKI6k6xvGs3D4UiIKwUijpWQh6SWl2oy5CpJHA3No/c+yW9IXKQRv1I98jUCsaPNKXDqxAahePqorzh5ccfqooZsJQIgRTdvE0IaGYHBOmkyIydToJ66OpC/eW/W7704n9++7JPu8q1CU9x0aV1Ww6RScTHa/A7NymiAkdbLReT9Cnxgj1CUBqXVHR0v/5Em3b4hY14FmK1dVl+bcEiMjI6OAjIyMjHxZ7v3Tf7pwp6cvUxXkRScgJOOb6vnI97xWPnJ1IoSgVAXB8+dz/8UXK395Ge40FYsUzUDvDUzsr7pIpHLBgilDQZGEKDBIluIi5AohcVGyTSDGGATFaEC0PVOiMjw5mTLtB4KElqul2hD6akdVTMeyLFLIcHeFd9kIkCgYNI4PJcYGUlLcW6aUEO4Jhl/6lt0hSIN3WT5ybHfuNvLRH28kZNcjUr7mbDD1qkuWDoLI4pH17E4Lc8nTllXk0osrF9kCxDq6+iVmDy5RP2xhUwGMG/lo1TStEpEEqtpwfOQwnXjSzETzAg0d3ru0GEFVnZ055/1BUpErUwfHezCNKPYXycGgGrJJjLtjQCTXfja7rh8/jtXDh3DHxy3qWub9hTe78ldX1xgZGRkFZGRkZOSrMOl6QGazl24yeUGz5V75IP8nykc/SNt9QS4uruzp042E2HweIeFmslEQ9P4m+UAhJii2JhFIWv+SNhEC4FrIt5JL8S02cSGNoZeRECLVtBFSOQWry05CUjid1vb222foWDaN2nYZkeUGVvx297d2CxCKqIvycb6hJMvH8HxvhtWQMiTyOAyIciReh/WyUY5ZQpwrKyApm+PcYF7IRUr+x8jiugH9dTAfEYPOnRurIAa0FWzeT8FaAcRSbvZS00dXsUrywUn/h3rnj1g3Ldo2qKpgR8fG6cShqhyco2jmImjITCZW37/vq9nM9svHmxcRSiCJfhPCUj7AUj6KsYOAKrPltK6vJg8fxvrRI6Z+EtlspsTKOfeq9v7y+MmTBiMjI6OAjIyMjHwV6sePX01nsxcuiYhV1RX+V8tHcU0d19ddFeTSfvCDefXFF2sul0GJWwREUKJp4mumfKk/yFuTkICQkiWEQlQ39Ht1BMBHwYLkwvZaLyfB2mYdEWO0YYWh/Lm8dz73gbQhcrW+jpIJYA9Iy4F1GfYuaBtJwyCW50JJUalgloVSLHIGU7CsT/kHPmEDAQCJEuJm8maD5K5BvNx00A3jurGUjv3s38CPfQaQoK9hZ4/g3v02/De+j+pbPwr/tT+myTvfaqqTh23l6iVk8VrV0Ys4SfLh77dCpd72YogIbdhUP0I6rira6bG3o2nFTpzSZaybiCgwP8O6dqmC4HwSkUMkg+SN96Xc/jwAhgCTNucg0UEVrfF9COTEymw+rarL6cnJapoqH9N795gqoxApNc3CO3fhyYu0AtYKIyMjo4CMjIyMfBVOfuM3lq5bjnc6PXdV9YJm4X+HfGQUo+KrV3N+9tml/+STa//55ytbrW6UECLRScpi0epm+cgXScBRckSCWwDIUvqmYm2qHYLvxhaxCkwB/DZyQdGt1yvFtom8qVcDAM1oXR/IyUmNBJfraxMao5F55aa8+3cZup2IgGX1AzGPiuV4Y5N1WanI8kHrkyUkH5dyYiyrOf17DCsffJ2FFKtUFbHy2OByio0E+VrB0fBsAEHn4B69jelP/TLO/tLfxaO//U/w+O/8I7z1d/8J3v57/wRvpdz/m3+vPvnrf+es/tN//vHyu99/62V9+nge3FkQfO+2ueUHbRu6bI6dAd5zI0yCYb2OvL5uFFoBQu6xso18OAeSt4pGfn1w7UZBuel+hAAul7C2Bc3AUjpiBHvxKBJq5zr5uJpV1XUSkDCdTls3mUCkQleVDOHanHtZJ0EhEDEyMjIKyMjIyFdlXI63Oj09r46Onvvp9BmB8L9LPvIzijEkCbnmD35wWX300ZX74Q+XtlzGfRLCpolKmxjGy8vm1s/O55IBsHL6VbkviIFRIFuoCimxG4WqRdzKiNTFN+t1bNfrAEkkYcC+1arIk5MZHz8+Rsd8NXewVdmIvYn53R4W6ML+K/ZBKSJCjILKMUWDlGCwoaAVKRvKh/fR8uuJoqIC4k4UFZ7iePCHODfpf37eWlFRMaqsCvWv5GOQsHsPcfTzfwIP/+rfwVt/5W/iyZ/403j4Mz+LBx/8KM6+812cfvNb3cizH/sJf/yzPzeb/Ok/87D+a3/lnelf+JMP7f0nFfJnxL5PIkTEnCj135ltK8wXActVVAhiBFjYF18nFXnMOey+QUhwvUYyoTzPMIsHlLI57q9bFzLWzi1m3l8dVVUnIcuJ2dKkNZpmHa+vl+HycsEYX3jvL2ZNc4k3wcjIyCggIyMjI26x6BrRzzfTsOr64s3LR+b18pGfV9uGeH5+xQ8/fFX/wR+88p9+emWXl2u0bVQCEhhC5Pn5Kv7wh/N4fd3oFvkgBhuB58pH8Qq3CaSiKB/QBVU//apKydd82za2Xi6lEJTlYzPmkJvYbFbZo0enAJQEZOUC584q5Z28N6N52CYONNttpIccZinJv+AsHcU4lA+B+75PP7JYrjdD7GDOLc3wJF4DB8sBpwz/Kf7A5kA0bqSv/OTqT5YRQKD3qL75Xdz/c38Zj//cX8Kjn/05nH79G5jdv4/J7AhVXaOq+l3Wq3p7fnxs9eNH/t4H36vf/pO/5N/+W3+hmv3cBxWcQVKWEClExS4xQqBSsG4Drq9btA1o5sTiJ+iqcmGxCJT0uilXg9woITl7n5O6PTwQLy6yoUEhZPmAgM3I3vO7ykcnH7NOPrxfTMiVW68XTOKh8/PL5vnzV23qyfJmL+pUHU2ScoE3wcjIyCggIyMjIw9TtWF6evrcpyqIq6oLAhrIx+0M79kvKHeVj7ISIl1eLvCHf3jhf+u3Xla///sX7rPP5vbq1ZpJRlJlZGGffHKlVCVRCNIt34Vm5OCv+o58Sz4mEE0MErBrPE+jcraVkSYEt1pcx9A2GjZ2d2GWku1+ICfoaEN0TbiuzMdiY72iF8LvZISDqVi0nYSIKb2ExD4D+UA+HPZvZFgoR/FIifaJCXFnSA5EpDjncHpY8flSPh5IiaAsHzHLR9wGAqoakx/9STz8s38BD3/hl3CSdgSvj443wpGlo4tzLh+XYTWZ4OStJ3zykz9m7/z5P+FOfuknKptUlASFlBj7CMkt4uVVExeLBm0bQJrMCEDK31pNE8NqFRHC6+Xh9RKyt5JSRm2L9fk51p9/jrhaIabzoXz0qDKbT7y/nlZVNy4nzq2MDFgs1vHZs6vwwx++aj7//CIJzaWvqi+SgJw/H3dAf4OMjIwCMjIyMk7DautuGta2Gf0LmK1v3Rn85sqH3pR8YDeFRFguG37yySv3X//r8/rXfu1Z3Y2//usv/K/92nP+1m+dIwkJAN3yvqKZ0bncWEGmlBtvAFA3GChHNkZEQS4i5uVyqwB0x32iWy8XWC7mgtSLx0BEANA5+m0fyAQJLVZXjhaybKSU07AGY9ETAgOY0lcNBALlFKTNCGzPelju4F6siIWMNtmHlN9TEIbX83H5Am6ESJTfLY8F0v63UfFdYpcYEVKyhITcA1NVmP74T+HBn/zTuPdjP47p/ftltaOUj9eJCGZnp3z4/e/ynT/5i3b20x/4yWxmvqocQTICFLBatnp5vtT8upFiRIwBkGRUICUktFqF9tWrjYTsk4+7sE88bsr61Stcf/KJlp98gubqCgphr3x4spOOq6n3O/kwU+7B6iSkffHiun35cm7Aha/rF9MYX34bCHhTjIyMjAIyMjIyYsB53fWBzGbPzPurg+Qj84blY7hZIefzxj788NL95m++cP/tvz1zqTLCrXxAAGM37nlfmpmrKue9J4EuzsrqBwArRMoJjcNGwtgLRxUQXZaP0AtJ0zZczrsqSAsbLMNbiAjt9DT3gUhX11cmrp1z8sWO325PrAs9aG6bojG9i4q+EJV7cXQZbpQ+RHkoTwZL/XYZrsKl0hiK7EP53bUTGsXieJsY405O8mdL5WfshCMGxD4hRd2zzlB//0fw4Jd/Faepv6M+Pi4lI49dbrw+zPToiPf/2Hfs0a/8rDv+znv18clxNZ1MfBZLy9UngflnMMXWhIgeArb+4gu1V1eRhUx8WUje2MyutsXi6VNc/+7vcvXxx1DToGMoH45cTqrqOqWTj8XEubWZCRmJUVKIMQZJ5v157f0LP5td4k0yMjIyCsjIyMjIg67h++Tkue+X5AUQ//dVPm7fBJExqkuec8TiPg3eN58672neG82KtgiWz8q4xcjogTXBGIFeODapujGnjcEtr6+wXFxHJCzLTJ8sIzadevfkyQkSmi9WDHHhzBfLzu5iOWa7kb18wMo90PeXEAbw9k34CpRTNHjn8ywFKM/LVV33UtZPVApH0cMReqkIYSsYcXhf7O8JYZM29gm9iEDwX/sGHnRTrr77XVSz2X7JODTeY3p6kiTk2zz7qR9hdTRz09nM+cqZI2AAXIr1qT1iSusNyrIxOT6euZcvrXn2jLFtRRJflb39ILn68dFHmP/X/wq0bVnFQsbIde39dd1XPuqtfMT+XkUgB02M3Ric98+ruj4/TX1ieNOMjIyMAjIyMjJOw5qcnT2vUgXE1fVzmDX/CysfmRufuW2TwYF8YCg1Kea8dynsBcR60WCxghXzcwS12ZiOtugvui4RcgHwUfJ5atZqvcD19SVCaPcuxdudu7p2/smTM5hRi2UTF8tLR5MzP5SPYpna7TH7MZ+DQwkh9qJi0K0Ssmejw+FeI2Xye6I/1nC61OA9Yg5imSwWvUw0oUljWwZhk4DQnzfFtahteHqKez/787j3/Q+QKnilcOTjr5SjRw959kESm6+/JTNqW0UjbCchqjwxqy0e1YwTU2sEZg8enN5/772HRzHO9OyZi9fXIIk3RSkgYb3GVZp29eq//BfETz+FhvIhiUBTO7epfKSsusqHy/JRJKa0kpoUOHdVTaefzyaTp2f/M/o/RkZGRgEZGRkZ6XZEr7dVkC/M+6s7yIfemHyQ/DLywVt2h8jPmHO0TkAGFRBwC0iwx0gk6MC2hi0cbA0ChVVQhEXACXJtCH5+9QrL+RzctxTv9vOdv3dvprp2ABTmiysHtt45lBJSVkTKJWqZY+U5tyM6OJwIVVQsBsJQ9nD0QSEeUUCMhXzEfiykojjeCcywFCLk6VXblMcxIBRps2C0DZpyLEXkf7D318GSJFm6J/h9R9XA6UJwJBVXbzNzDzNz9TL9v+//4UmRebTM8GT/XGwYnkc70z3VWF3c2V0MmZUQHHHByUD1nDVzd5MwcbkRkRBN79kv+qujqgbuASJ9vzx69Gzu3UZttDEhJEbf9wM4/v4faBvndYbjuWpTmP7CDeYff8XMOyNpvW7wlqWOo8xZ7hhysTJFrJM8Tw+uXTuaNaefTZvaH71zR9rCcMSI5wlJQBXr+/dx8tprWH3uczDVflqqi5o412Y9Vqlzm5oPJxIvMqW6Mx8RMPH+NM2yeyPyhEDE82ZgYGAwIAMDAwNH3/nOWdIcx7vLgjwCifdlPlp57zgee2aZgwifp/nozEC/pwH77957Rrz3G/PhnHTLshM789H7/eyMg3mwSCkrAtqIPQEkjKQRLIo15/NT1HV1cTF6I3dwMJJr16Zo0MVySbXaiYN3rusHshn7niGRjaRnZtgzH3zKsVTWaM8w9IWLOqoDpo9rNFT75qPTfpajX+B8MarxsUw784Cwy2y0Cn2F+sIsSKfNemtEGsmlKzj6wR/C5MYNuPeQ+RCRLrZ66j2tsoMZJi+/aHIwViGt+7MXIdLMI0u9ZYLCh7BORGx27drh+Ohomk+nI5dlSbx3zxbf/KaVJyeK50xxcoKHf/zHOPv930e8ffsi82GJc+td3UeRe196kYAnoI1iIyOjT9M72Wh0t8ksneFPioGBgcGADAwMDE0Js6Oju40JeeDy/AFEqvdsPkQgN2+O05/4iePRL/3SldEv/MKV7Id+6NBdupRR5F2bD7Z695/LVgZAe+/o1X+4zoTsMh+dHtczkBTA2NA96CEhhSwTuKLXWKP7zp1oGrmcn2G1mMNUQWDfiLTZpdTfuHEAM4Szs5XW9dqJs63ZkI1kZy6k645+QQM/ot8QsFGfvlGwvaLyTr0MR09dlqLXab1nPnrru8LrToAZnoVahJn2isdDo25bVT/70TMfoWdCtFF7rVVnSgCMPv4JHH3ko0jyvDMdTzUY/fn++r7619osyPjaFWY3rwj5uLlgkgicwBKiSjQuXahX+cE0Hx0eTtr6D3rvo2r7910vXnutPvvGN1SLwvCcqBcLe/S1r+mDT39aiyb7ATN0dGMRKTd1H84VrbxzAU/AzBgMjczg3Dxptl6NkuTO5V/91QX+pBgYGBgMyMDAwIBTPc2abViNCbnvkuT8QvOxT/80qRs3xskP//Bh+iM/cpj/0A8djH/8xw+mP/uzx5Nf+IXLyUc/OmWSOOzgE8zHezU9O2wn6F49iduaD0cR2ZmOLnGCYGZR1dTMdsbCek0FLYXbZEGEiBdWXrAVUVUFzs8etQXp6J7vGxFJU/FtQ0ISVpZ1WK+XQlpnUvYh0BmOzontjdGohz2hBLwzHWY7dRmOvva2XHWyTriwJgSN3gW7eo/QxNjbQtXPeDQKW9WdYtVlQxB76p7DdIaDT3wS48uXL8x4PM147I9791687j3ywxnzm9dIL2jxCZllhEADQ73wjUZidZ5lSdbQPOMVkFhVNdbrovzjP54//J3fqU6+9S2DKj4ocbHQ0698pTr93d9dl5/5zLJNvxlgj08eA7q6j9T7daMyEQkEDHtwp2CU0uhrJVySPMjz/NakLO/1nxkYGBgQ/EkwMDAwnIZ1eHg/bbIgfjR6SBG9sPC7oz+dTBJ++MNTvvTShDdv5rx2LXNNTD/84fHoB35gOvmZnznOvv/7Z8wy3z30QTMf3TMdRnIvI+PonN9FWi9zgYZohlJVK1WLZv0MCGQj1Clk5eFKgIYW7nf2bjDDajlvTMgJ6qrs9wLZyjmXXLo0sTz3ULVyvpirasSzubCS3C6Y9LZW7RWU96QXZTd0O9e9DuO6lyXZm78XdO/43L6Z6IxGvYn1NnYZkZ2idgak3sTk5guYvfgS0tHoQsPxlMzGs9YuNCLpZILs+JCSJUJye59QU8SlL4uzkVXLCVVzgC7GqCHEUBSVLhZrnJ8veOfO6erTn57f/o3f0Eff+MYHqgeJJyfh/LXXVue/9VunxW/+5t1kuXyUZtmpd24BoDIzBaCJ96vOfGS9E68uwkBWSr+McIGsmve9k43Ht8fr9RkGBgYGBgMyMDDwJ70NK2mbEh4cPEjbWpAkKUmiFUg+0XyQ4OFhguPjLDZGJHjvalUJgGiee7lyJcs++tHx6Ed/9DD95CenkqZykfnAezMftpcx4N5pWG10FNkIQP86u9ujGUKj2qwzIRu6XEMCWaeUpZBxL/UB9KYxBszPTzBvTEgMNfZrQfxslkt7HK8Z6tPTeayq6mmeozMQHZtxV0je79HR/dqv0TD0TIU9lu6dSqW2VTfeMyytVPWZ5sN62ndJZoaooTMSPRPSbbvqm5BGPbPRShtZt32Lhvzmi5hcuQrn/TOzGxfr2ff27/FpgmQ8Jr2nAYxBVVTXaQxnE9TzKWKdmzFZrdou/evGJCz00aNze/RojocPz91isbC3316f/M2/WX3vP//PcfdLX0JjTvCeCMGqt94qH33mM4uHf/NvPlr/nb9zJ1kszvI0nTc6zbPsUZZlJ0mSzDPvz/vH7e4Xne+jBlmoZKVSvPcP0/H41si5W83pV2sMDAwMDAZkYGDgT5rxZPIom80eJZPJA5/nJ845igiFBPc8QH9is1kas8wFESmrCkVRYLVaYd3E0ow6myXJyy+PRs3WrORDH5pChM/FfDytwxvpAPiukGLvI9hN1MzCLgvSf7EAcGDc1oJwDcD2jUerbq0uC5ydPsT8/BRhZ0I6+fE48devzwBs6kDq9XplT2jLYb2mfZ06swHs5uiE7fyJp1VhO+712bho+5Xqfpakk/ZrSZ5glgD01JmhPtvPjY125kJbBexnNzp1JkTj9hnVemtEfILxjZttn44uW/GBTcaznnPO0+UpmXrSYIlZ4YvqdBTK00NqOSaYA/DLZWl3757h7t0T3Llz0mY+5ORkKWZKIOpbb4WT/+g/wtu/9mu49d/8N1i//jpQFHgqRWHVrVv16ec+t7r3t//2+cP/7//3/vq3f/thsx6ciCZJUuVpusqybJGPRmejPH+U5/lpmqZL7321Kzo3PAEzYBElWyiTSCmTPHunef6to4ODe9hjYGBgwGFgYGDgT4C/8qu/Wv7bn/rUQb1aHWtRXLW6vkzSsQGkUETYRvRwTvT69XG8cmUUp9MsAhJCQE9UgPBeJE1J5ySen9e2WIQPYj66ug3rLcrjGgwHkVE+mYxdmmYxBK6WS5hq5ZOkoEioVa3uMgokDODOMPTdipE0I1yEZQAcCbS6qC6kNR4xRpACnyQQceiMVj2fF9V3vvMQqpo0NSH5bHYIQAxbOnMRTaGqj0+Osrid76LtrhkMaGJH384Zei5gO+wZmb76HcjRGZh909HF/Z1hT4Ww/uSxO2nQNprujI/uPrf3e7PeCVq943vl8BJu/sI/iKtN13Pv/YXmgeS7UsO7uqYx4uydO/bwta9GOz1bjBnnM6kXhwzFVGAjgJ4NAFFVEet1ybIMVDWkqbc0TaNzIxUZWV0nTb8Oq+/ds+L0FOXZWdtIkPV8jrhabRTOz7G+e9cWr7+up3/8x/XDP/iD8uFv/MZy/tu/fV69805lqmKk65rei4g659SLBPE++FbOtapFxLp/xxedmxbN5H7g+Kw2SRLePpjlnz86Pn7t5v/z//m9V9FnYGBgAPAYGBgY+BMiPTi40+hRfX7+MBZF6VQncM6TdEbSVKGqMYZQt4IIQEJJqiqsrvueAs45lGWJNE2ZZVnKGzc0+djHZtoYEMzn9fs1H+hGj9dNAUojAI4iqZEJAForMwVgsnMQbAHUSKDLhJhBumtmBhIOiKnJMtDlhUXfZaH3syEdxWoBmCHGgPF0Bp9kACn+8HCMPHcoilCen8+1+XMQ7x16Rd6xZzB0F02tMwbbObSbbyI6E9HZsQ3sHclLcM84cHelo9fpvDfurtl7MB6GJ9MZnAgaEUGAsUtHoU/3mf2sDk3hx1NMLh135uNCw/E0+u/dH3faXyfFNAaVsliOUZ8fSL04YizHpOWEc9sPpQJiSZK4xoS7ySRxWebpvTMzYQi5q6o01DUQI3j7tq1OT3X1R3/UZg9h4zHk4IBMU6CuTRcLa+s96jt36nj3boXVCmY2ATmGWaRIFFJFJDiR2Eg30blIIDSCAlYDEDOwxWxrzs0MW3geJT0LyCuz9UHq38jH47cn3t/+Uy0+HxgYGAzIwMDAwAx4sDo6ul+enDxyRbG0qnrBJUnayHfJAdOGGOtQ13UArPTexwu2ErX0MyF1kkg2Hqd84YWxu3+/jN/+9hyq9r7MR59eTboBAiAjkNpuC5bt6hi6YhEh2Qj9F7cx7upB0q7uxcwImIdUCWwZaHmA5ejg/gAws82JWDFGVFWBbDSGcwk0kYyzWW7r9aJqagTqolink0nSbbnqshyxO7bW4jb2MwM7wQzoYgesyzv0Mg0AaaARYHcVsH3j0Y99K3GR+SBAn4Lj2SYjIVkO5iNYCNDFWaNz2PwUFip0cPvcXk3LngHqYf2RPT5VLJ3NkKQZpLdF6oLMxRPNB8l+3Kilm6tqd4Tt47lGY1XWWbWaj6VeHUiMuSD1FGeAK8lNVDKhb3DOJ96nlmXOp6mwWRmRLlX1pkqNEVrXVtc1wqNHWr71ltWrVYxlqQ00VdEQnJl5Ag5k3shaYBa1jUAQMpCM4lx0ztWJ93XaRO/cxqAQMJKqbewaZXaHLZghKORUma+IJMuTN8fT/PXJbPaW//jHH2FgYGDgT9OADAwMDPBTn6pPfuVX7jZdlh9ysTiPITiSY9fivTjnAFJhFjcmpIkuy1IjXcDFdEYkxsgo4vxkkvLmzQkaE4KTkwIN79V8sJGRYDfeXTcgNdWMZNpI0NDVPwigJMGurqWh/1OoARbN2Ahud90AiJlmkFWk5dFiYoC7yHz0p3VVIIYaZbGCT1KyKlPMJiPcwyKena3L5XLhRvnMDFTTXXF2I30sNW3VmZFebYj2MhgXpDfAfZPR/d8eBtt/zf6N3TtENoYj++j3IX/5w8iuXUdycACXjwASGgO0qtBkzlDevY3i9e+geuOb0MXp48IQPjth0rdIXegMiIjbRbnQgHSQfKb56GKnznjsrzFGJMtFPIxFzBP1KZkJkETS14AzwMdGBjiE6Fxde1+WkpDizehaeU/nHH2abj9XVXJVi3Wt9XSKarVyjdrtWCGu1yGKSIzRR9XN+wF0vWsQzWxrjFRJmpAh8X7l0nRlaYrOrzUyE1EASlIJmLLBGkieRWTn4Egd4niSNQZk9MZE5K0rr75aYWBgYOBP24AMDAwMSJrec5PJPY5G93W9XlgIl7E90lawLdI1EYku2aRFIryXipTSjPqMLTBVjKJp6tsGhXL9+kjm8woh6Hs1H3hsPthlT8T7DKq5qaYkUzonaNAuAyICNnIk3M6ExO51vf/IH8xM2Ou+QZoD69SwCLSsgk66j+5g7386zCKqYo1QFWBUL6M0ZwNCiMX8/Dw5PLhKYRJ1a0C0FzvZZh63sXeKFcze39G9F/PUE65kdozRD/04Zj/wwxi3R+DODiBJApLov78reI8f+ziqH/xhrN56E/Mvfx7Vt78CK1Y9E9KLBvThnrXqYCtVE3EU8on1HhfwRPPRu9ZTLxNCwtZryMkjjkKRCzE2MgkGp2ZeAWekVzMxM6LVYgEpCkqSwKUpXJbBN0qacdKO23XvKSJsrrX3WTIaaTaZoGpUnp3FujUiIdQaI0OMrlEeVb2ZEQBhhgbHNppRVOlU1avGRCRClba9TxR0RqiRBlLZqDa6c+Noaciy1L01HeffmEwmb4zq+j4GBgYG/iwMyMDAwMBBVZ0tm1oQf3Jyu06Se2G1eoFV5Soz9ao0MzrvnRNxIKOY0atKE6F4NsE5r5NJ6q9eHfPevYJdFuQZ5oMXNC4kYELS5XlO50axqjKNMaeIExFa1+0bMEcaSXBnQBpAM0MPA0z7WZDtGgXQBFxnkEWEpQqk2GF736nvSEjAzADC2cFsRie0qKgePjqtr16pmSaJ9us+NCLuYpcZ6a6bbdfRxA+OPbOuw0CkH/okjprC78P/1g8gOzyCeH9hhqEffZJs+nSMLl/G6OYLOPvyi1h85tPQ+Ul/t9gFWHflAhcixghYCOCWd5UB2Tca+7HVPv0tWPHsjLh3NxHYJSMlqkowEwPYP965H2MICEXRvQx0Di5J4PMcSass20SfJBTnCLI7pKEVJUlUyGjeRxdCRF1brKqRmiUG9DFPlqlzReZ9mYusPaC2+37aRAVo5FYAlc4tzWdLcAJn1Xicf3uc59+ZAt87bg6hwMDAwMBgQAYGBv6MtmFVD379199K7tx5qxJ5I4RwMxTFVU0SWpK4mCTivBeXpuK9J8pSWFUiMRLvBhIxzxO2WZBr13J3fl4iRnsv5qODDWmWpW48HsUYMw0hB5nJtgM6zAwxRkDVxHsTshV8o0SEtWr/s9DPgpCE4+4Lme2O5XXLAMsKqO8OwuIF27D6a+xqSsajieWp57Kow9nZslqvl95xpGbsn3zVKmp/vI1qEWb2p2I+QMH4h38GV/6hfxSH7alT+Wi/zuKZxd3iHA5efmXTzM+Nxzj7zb8NPX+EBoM9a+MVjI83YBmZw5Y1quWKBN51AXp//b1mQKyugZMTJotFIteuwUJgLEvUqxWsKGCqF2aZrBctRqCu0T5XLRagCDoz4rOsVTsnnWOsKlZFITFGcUBNkWAiZiTbqDEazNgI0hkQ58rEuSoVqbxIJGkEFA3ObGs6AFGzTSwlSRfmJoVZkiby1iTLv3JwMPrWaL2+j4GBgYGnQAwMDAz8CbP6lV85Orl9+2fmb7zxi82xoL8UV6uPgUzoHOm9k1ZJ4nwjOzx05csv+8ULL/jq8FBA4llYg5yfV+mbb879V75ygtPTEg3v2nyQFMA2Zb/T6RhpOq5jzKvVKgvrdTI9OuL0+BgG4PThQyxPT6tRnp9PRqO5c66uYtR5VemirqOaWa8vyW5AeJKJSN8RQc1Yis5WiJdr6Gg/HbMN3MZeFoRotC4W8sU/+kPcuT+HCPPv/76PJ5ePP2yE6wxI78jdnvkI6I6nhRnsff8/hHd5nK7zmPzEL+L6P/pP4uCVD8ElyRN/0Dez/XjhD/TFo4e4/5nfs7Pf+C9h68WTv4Whh+wOMsuMGJk/uGQf/5/899wn/8l/RPLJpMuC4D3yzO/bfefq/n2c/uZvovz852FVBcS4MRLrkxOs79yBluXTzccFayTh8nxTUN8dJG2qQKM2xp2xIaAkg8YYQwioqiqJqh5m6Io8vEgxSZKTcZYtmrhs5hFPwow1nb/PydFtdbPSwupomn/6xePD//zm5cmnb/yNv3EbAwMDA3+WjQgHBgYGxp/61On44OCd0WTyTjYev5mIPPKqS6nrFYpi2RiSRVgsFuX5+aI+PV3FxaKyooimangXsMHG48SOj3P/wguz7Ohoko7HmU/TxPlNtbv0/pP7Rt0JVl6EqQhy7yXPsjRLksSJpCQzM/MUoXiPJkJVEWPsatRNRIwkvAgT5yiP382++WiJrcwMgLFX556aLDPIuYMEEtiKIHix+egWEp/a8cHMAIOqhfOzsxCqOsSA0DXl28RobWx0sfnoYe9K3S/0dbH5IDH+0Z/DzX/8n8Jxk/lI8xzee3RyzvXVrfWvXXjP+PIVXP7xn+LkR3/GSD5uW7j3FQkoQSVdo9yIiQmmKhxHrFSXt+6gXhd4v+ajg+RThRg3BiSenoKzGfylS4/VGFs5OICRMFV00p1iN75oTQTJ4SHGV65g9sILmNy4gfzyZTQmGuY9lESMESFGKes6Leo6a1WbeQXQk4pI4ZyrvEgtpBqejIG2ZJbNJR1VIBNxrx9k6WsHR9Nv2s2bD/DngYGBgWEL1sDAwEDu3O1yNns7np+/ifn8BY0xAUA1o/WPDAW8zecmRSGMcdtK+l1g3tNms8xfuWJ5VXlZr6OpKhrVZRmL9Vo1hNqR6snIrn6DpJDwzonLskSdy4JZojH6WNfSANl9haiKuK0bUBFpBSFhjRIRJM5J7BfBk+iwhrhLtrh+zcluK1YEswrxwAjXr23Y8zHozBOcc5zOJoYt8ex8LlcvLTVLMzOlmpp1mRCL7ZhNhJl25uNdYu/7cvrKJ3C92XZ1/JGPwqcZSHZ6X9mETiQxvXkT1U/9LKu339D67e9gfyMW0SIweANSEGMIciUTM9A0Kubfe1tXj054cOUy8RwgeeFRvGE+x+rtt1E2EUkC6b6f9xAzuLLc1Hno2RnMeuZuO74Q6/4svYfPc4xmM4jIxnDUZYlqvd58XmPqUTWKVdVeE1VF1y9mhxEIXqRyInUrkIYnYcCaSXbm8snCXOYcHh6M0tcOj6ZfOxyn325Ovqrx54GBgYGhE/rAwMDAX/6P/+P1v/PLvzwOi8WxVtWRluUVAiKkEWilQkbGGJBlEg8PvU6niSaJsAHPgA3SKI9RxiG4XMSnWZakDSATU/XQ9m2CzDmkW0kjtvLNffQ+j0Beq2ZlWbpQlvRJgnw6hfMeVVliNZ9DzOosy8rM+4qkdUXEQdWqRvvmY38u3ICuAzspChhMkBjgAbZ0RSFb7X6hnyUJoeLtew8sRkUdgs0mU0vd4dbU9TuBt3EnGBr4gYyH4ZnI5ADX/tl/xW786E8wHY8hIhfKOQeS/aNwu/hUiXNwWdbWcaB641sKU/QzSKA3MMM28zHamA8wBSAGIwwGrSrMPvaKO375JbrE43mw30ek/YzFd7+LxVe+grhawUhoKwAqshnHEKBlibhYbLMfe93lL8RsI9cVoycJkjRF1ozT0Qhplm2MiTRrJtKako0JsZ5Bk1Zmlnm/GiXJapSmRe5cLaQRF1NR/KmMp4+Qziq1epy6P7xyNP7ta9eOPnfz//h/vIU/TwwMDAxbsAYGBgbk8PCuPzy848fjO5IkZ9j7YYiACaBusSj8YlH79TpAFe8W9V7CeOxtMsl8nudpmm6UZdm4+Z9JlqaT1PtRoyT3XkbOIfOezT2JOJepahrqOglV5UJRgAD6269CCNAY27kKaZ2JaIATQeocExGCfFpzQyhg+/UnKWSVmpw7smLvhK2+8ejCdk4iz0YY5wlaVGHLxZmGutYYTLVRrK0bm0Xr9eWwJ8u2etovPEvU6Y/9rF374R9l1po355647UpEnrz2DI0Oj3jwie+Dv3xzZ2LZSAzIGo0BTLDddjVSwO++/TYISb9aYfm1r9v6wX3Dc4YkoIri3j2svvOd7fYr4LFIdJ3/+8Xr2i/Ab9Vhhn1ZCCgfPMCyqSFZ3L+P9dkZ6vUaYoY8zzE7PMTs+BijoyMk43HXQHArYBM9qYnIpvFg2kRHKnExauCCWX7CbFoAkjq8eThOPn98NP3KwZUrb+LPGwMDA4MBGRgYGJgBJ/nh4W0/mdyW0eguRUKvczkE2MivVsHP56U0UUJQvEtUBHWaSpkkUsXoYwheY0wdmSbO5alzWeJ9ljnnc+fYjMU3mPd5DaRVjGlVVb4uCkKVFEFXNB1VEeoaGqOJiLpGTeyyNxCSqXPMnBM27JuPru5DAYsXnB4rYEwgy9Rk7sBePch+BoTda4k0SXF0OEHnHM7mZ1qVyxhra6UaTU3R7eWhwYhGhk57+33sIpPxVLh/j8H81Rfs6k//HKZXr/WNxzMlIs80Jq26sU9TTF98ifmHPy6AGJCYYWzEtNEEglEkMwWcGQgDNnIExylkKrULX/sKz772NcaiwPOmfPQI829+E8XrrwOqIPlYABgCdLVCnM+hjSxG7G+7ghm6tb46tCw3Jmfxzjs4v3UL58142XxuuVzCYnxs/rIM0tU+9eTIOhGpGtUJGfAEzIxLJOmJ5NMVXeZpj6Yj/+Xj48lrl68cf+Po1VcL/DlkYGBgMCADAwPDkbxlcuXKrfTg4JYfj2/RuQW6PTM9GIL58/O6zYK4sozWgHcDicp7rL3Xoq7jej63YrlEXRRiMYqQLnHOeedEGjFJkuj9KABZMMvqGLPWgFiMXYM6OO9hADRGxLoGSXUi0TmnvQwIsc2CSOq9pCIg2W9waOgXpJs1auhdYyMP1onJPAGXAsbOdOxev1W/L0jiE0wnY3SsytJW6xPToGYKmBrNtNvidlG2gzDdCrYTerJ99d/TjWnQTiR19gM/yksf+ziTLNs3EF18qrHYX+90kTnJD48weuUjwuQQwJSwViMQmRoc+o3TnRkTDTJG1ah0aVxL/N7rvPfpT+PRN74BmOF5UZ2cYP6tb2HZbL2yqgL7nrRVjIjLJUJzX3j4EHp+DsOTeUYmZPt5TZ3J2Vtv4bQxImdNVuS8zY6071+vN0YFqmD/PYB5kapR3SgIaXgCBZw7caPpOZOxQYtx5r96PMs/f3R0/I3L4/Ej/HllYGBgKEIfGBgYmAB3y3Yb1tnZ7bhc3rX5/NAA9ruSN5g7O6uSRvWlSyGORt6ShHgXBO+tag0IUCeLhdHME3Bo5LA7Esm5tBEi6WrVpDRL60YhRkeAQsKwfcLtmuXZ1oCYAOqcU/e4dgWG3e0kMhEE5ySYqfaNE4keFncrjmQ/m+DBwoxnBpUgOjVA9g717WaAiON0MjERQtUQ1WRZnMZxehPCFLwgW2HgMwo5rDcgAd2/wic+bJDZkR3/wA9xfHypMwvP6LHx7CN4W1QV/SL0bp6MRsiv3STGVxM9XYHwpmCXMjCBmphZAkViSm+BCVTSYBKXBUNRoGoMyNuHh5vjbA8/+lF8UOrTU5x9/es4+/KXN9mN/a2GiBFhtdLY3NcYEMaHD9n9Po18z0aoexZVhbIxM23R+Xo8hp9MQOcQmvXq7AxQRf/dBGJrPhLnNgYETzAglUJOZDQ5lWwaARsl/M7RJPnM0ZWDr10K69f56v8u4M8zAwMDQwZkYGBgyIL4y5dvJbPZO248vg3vF33z0cH1OvrT0yo5P6+kqiLeJSaCkKZaJ0kdqmoVimJZl2UR6gZVrWL0hWrWKG9j1SjEmDVXE1MVkpDuhCzvt2OzTXQiTLyPTVRxLmJLv6obTkR2W7EIkk8oSKcCsAu3YsG8Ye3BuYOsCVqX+uixnYsQ43yELPXojNCymLsQFwRsI9sTbSMQzxQBbSOwE58m28Tsxst6+OGPIM2yi7dQXax+ZuOpGY/9+733zA4PKdNDAVIxiABwYuZSi36klZ9okUziyo/iyuW6cmm1FJufU5dLoKqgJyc4+Vt/y773N/+mnX3nO4oPQHn3Lh699hpOPve5TWajbzxcG0NQrteVnJ8XPD9fy3y+SrJs5fO8oPcBgO31qAGfkRHpsFZm0J3hWN++jWWj4v599PuMdM84kXqn2EhxAUGNp8xGJy6fVhSfObt9ME4+d3A8/erRZPKd2d/4G0v8eWdgYGA4BWtgYGCgOQ2rUrMDXa0OYllesqo6Bok+bKVqOp16HY99zHMHEeJd4GLUdLkM/uxsjbKsDYi2zUigxQCJgA9AGlSTuq69xUjudbuWJIHb1S9AFaGq1ItUqfdlmiQ1STOSBnTawAY0qBni09tpgw2yfwtoAgaQ7SAB0LkZkP2+IA1q0R6cPMJyVaGBURWTfGRpMtvdbkSHgYB1QgOfi2wTBbTDn/4l98JP/5zLJpMLTQfJD6yWfqyWS5x97dvQB6fwpswscmQ1805WMbVaEqvpLVBMjWaRZC0itThXSlFUxdtvV2WM5kcjjI+OCO+Jd4mt11g0tR6P/vAPMW8MiM7nYGc62mhmEkKUoiga87Gyk5M1T06WLsbS7Y7ApVmFRr2sBls90YSYgUCnDRSBZBnoPWAGixGm2t3fPwXLEueK3QlYRSpSg8S++Thjlj90k8OVS0ap6Mls5P/g6DD/zOUb11678b/+X3/3VfwFYGBgYMiADAwMDEw/9alFdunSLdfWgkwmb8P75UU/pHO1CsmjR2W7FcsVxbuqBWGDee90MnGYzbzLc3XkmqoLxriMMZZ1XccqBNfWe7Tqm48udtuuQl0DZtAQ4J1T10icCyR7e4Z69ArS8+5ULID75qPFGqk1dKZlpxYBY6Kcb07GAmsQBhLAVsSONMk4GWXYYVGVy+JE1EohjDsJTYVQ7tTVcOyrX9uxr4ufscfjNNdJWxS+7UnxbjIe71/dOxqleY5RnmCsFaZaNFpj0sSxrm2ka82sigljmTiuE+8XWZKc5Vl2Nh6Nziaj0elkPD5t5ifu4cMHZ//Ff3H/jV/7tdUbv/Eb4fz117U1Fk/DlkssmlOu7v7+7+Peb/1Waz42a2IGB2ylqlJVNReLjengvXtn/t69++l6fZLHeDoBzkbk6dj7Vie5c48y5069c3OXJAWTJELEiKdDEWRXr2L6yiuYffjDGDcxvXwZkiT7tR8goG5b/xHcBduv1AxzptkjPz5YuWTsqYtxyj86nOVfOLp6+avJdPpNAoa/KAwMDAwZkIGBgYF/95d/OWgIUy3LNgtyaHV9DKBfJACagTGajUZeRyMX89zDOeJpmIGNfFmykRNVElCJsaJq6GoaTBVR1ZmZsGF/G5jt6g64+0FXYwTMAs3WqfeVcy7u7uMm9rQLFJLdmmIPsu+ZsN/shIAR1EYRQhosMUL6X5MgCBhWq7ndud8/1lgxzadwLie7d/V/gSTQFx6PrRe7cT9zspf1ALiTnx3rzX/0n0qOXnmF+1uqSD73DEg3judnKJof/N07b1lutWUIIUWoU7EqcVJ471dJqyTZRJ8kbQar/XsskjStmrXKkSXM1jFJLISQLh8+TJujbd3y/n22Bd5aFIir1aapYPXo0WZ70/zb395stzprtPzmNzeNBJ0Z5HHmwyTGKOt1uTEfZ2dLu3//HA8fzlmWlajGRrXEGFwTG1WOrBu1xqBK0jS0BjoZj03yHCBpqgKzvbqSLclshsn165hdu9ZmcODaZ0QQ6xqxKND3ygKENvuRp+k6d64S0vrm4xxp9tCND+c+OxBqMfH4+tFB9nuHV46/cHz16mtXX311hYGBgYHBgAwMDPxF4i//6q+W/87/4H/gdLU6jEXRmpCrMMvQhwTrWum96HjsLc9dzDLHBjwJEg6gr2u69Vqg6sw5aQBjrCXGEoCykZDGx5kJwS4ZYb3iXklTiHNdRXQtQJF4X4iIqnV2o2H3nPU7Ve8wPMZ65oOdtlxY5kEyEgggaURqgHS3ksRmvC6Xeuvuo66SmdGUozRFnhx07+20DURf7EUC+9ozHnji3f7yNbnxi/+wP7hxszMgffPR6t1uq9obd7r4ev3oxOovfykmd26VmaDInKwS71bp1mysk53Z8N6XjTaGw7dyrva7GggDggIxzmYjOzoaI89HjeHwRVtH8eabmDfNBM8ak3HWnGx13pyYNW+KzJeNAalv3YItFnCq3bG2EDMT1ciqqrFaFVgu28zHwu7dm+PkZIUYI8zYCLaNxkYA1AFRyODJ2nsfkixTn6atjN7DANMQHMzY/7ttSaZTjC5dwqzRaNc8U3ed0ev5HDCDdWZRpMxbA5IkRepcTdLQZT7UJw/d6KAxHzMRVCNv3zmcZr97cPnwS1ePj79w5a/8lUcYGBgY+It4CtbAwMCAOzq664+P307Oz1+Kq9VLYbn8KMwE/QyBGdyDB+vk8DCLbS1ImjodjfyztqLAOdEkIfJc4Jwz5+hEiPl84UJYm1lQ1UiRqEDWKFfSwwwdsuuhwJb2vhhrkjVI68yH9dSHuzVPInNOCGilighY/36QUACu/xxJ9ObOWEJ5DoHU1JnBPLC7R4Qc5SMkXhCjdt+Ji/UZZqOCnmP0P+7xmNb7nkQHn9H13NCxv+jykXNp+kSz0dDFPt3JVk89BatDRPZPxzIf6jgK9VJTvxQyOJEgIpFkFFK5VWc2DfuoGmxDO46MMbKuK4qQzompMpQllIQAlG1EF9kZNFVt1D4bUNc1iqLCel1iPi+sKThHVQUkCRGjWIzWRDRYb1uUWVcvAqhtv0dtztXRuYrOZUiSTJ2LQXUEM7L3txbLErGuN2KeI01TJFkGcQ7s/pyxwdy2/iW6rcHtzAfOAt1Dn0/PXTYlUecSv3cwTj83Oz587fj69S9f+at/9R4GBgYGBgMyMDDwF5XpP/vPzs9+5VfeDqenbzXm42abBbG6PgSJPizLmN67t9bJxGue+9J7sSQRPAMjGUUckoQG0EhxANiYENZ1JUC0nQkhqQRGSnozI0j6JNkYEIh0DeHUiUQAathiLQCxd+Ruf+pIpCIUErUqohlif7tWZwIa+uYFfRMCloCcEbAKemCAB7gBeZZjkqdWlIHYYstyzbI+h89GaOG+s4CxbzkMvNBpcG+pP+rXNO/mPk2fuOWqg+QTzQd7f3bd+CKp6taMtHG9rpOimCNJlk4kdoajFd4DFqNysSiQZQu24/E4ZZomznvXSpwTIdkzHi1GVWWMASFEhtCaj9Aaj0bVRq0ZafFeoGogBSJtNMRoMFMDCDMQ/T/fhrKsW0Pj07QwkUxDyCI5MjJGs7EBjrv7GxOP4vQUyyxDd4qbxWjsEiwNfFz/EfzWqGlnPk5b8+HGs3Ofz0QYxxLenI2zP5hdOvji8Ys3v3jjr/yVNzEwMDAwGJCBgYG/6Djgdnp8/Fa9WLzQmJCXQghTAG6/VsKdnZWNCUksz70miVSHh6mJgA3owVZdgzZVbO0BRZMksW63VAjBx7ikaiSwhmqgSCAZG40ikAGg7IwHAZgqBfBehD3j0cI29mVm2EdI+u1LGcxMHhegE535eDJGAE5ZQAQAsc2EIAFApmnCySS3h2erLpuBoLEtRrdRegxhimdBGHqmYg92F7pwkVmh96TZ/tarp2Y/9s1HP15kRFQV/UyIhmCcz6tkuVwwSSq8D6wLZobGgLAsa85ma7QGJM9T5Hni0tT7JHGUxyVDBJSqxhAUIYQmRqvrwKKoNtmOGBVbCBE0Mqi2YyJGA6kmAg2B1s5brGHPg26uNe90QJ2qlkrWJhJrM4uqk86EWIybI3c7Y9aawaooGMsSfXNDIDoydhmQoLBTpX8g49nCj2bOMU68vtWYj8/MjmdfuPLSS5+5mSTfJaAYGBgYGGpABgYG/qLzV371V6t/+3/6P/W2WMy0rifaHssb4xj7/TPMIHVtFCG8J5KEmqauK4ToIAkfAtxyCZydAc0YZCsqG1SjC0GlruudAelOdookrdXufkcR6UyNhsAEiIlIDSD0W7p1sW88rAsku7GxYWc23C4SoGwjpPfOfpEHepkRgrFRENIg8CQd1UzPzk/t/qM5REhsYdDA2WgGLyMQxLN4svlowDORyYFc+5lf8LPrN7jfhPBJ45b9cUdv/Ylrtlxq/dnPzvWrXz3D+8EaAMQYrQ5BtZE1wnpd23y+1uWybIvIpSwrX5ala4xAMy9ktSrYmpXlsuB8vkJz32a8WpUIIe650A6CBERAEYKkbYW4NaSP1duqx8eHK5gAKqQSMNvKqVmC7rYYNwXnMQTUTSyXy01PEK0qdIjIpgC9UQFIfWKuNR8HiySbeccwSfH6wTT/3YPjw89feeXlzzXm4zt89dWAv1cYGBgYMiADAwMDBzG+VV++fDNZLK6H1eoFC+HQzDz2Wa+r5M4dQgQNBlWrZ7NUvWcLGsQMUpaQogBi7DdeM6oqzQDSGu2fuBVgtnaqChEjYBZjbqSPqkCMkAYP0HZvDD3zoWbd2J59TrBZG10TScL6V3sv6I87aDAPlqIwgbMoNlPvHcej0X5Nh1UhtFkQpNMDEL575wU7vGD9bVoG65uP/hczPJl4fqr1Ym4AjFvQ10X01y/OgFyMiEBVYWdnQd95Z/1+zQd6xfnc9yVmm39zoapqV1VJzDLnk4QNsu84iXcNG3UmBHSuM5lQ0rSuVWNUmKGjX2ciJBKyonOAGeFcUgFJDCFDCITZxoCs790DkwQwM92t2+NTs2qQsSZtleXjB5ZPlkzyxHM1zeQbh9P8s03Nx5cvXb/6hRvev9mYj4i/lxgYGBgyIAMDAwOv/uqvxn/3f/I/Ua2qaSyKaSzLyxbjBFv6GQBjXUcpSxUzCHY41/XoQ1KWTOdzuPPzjQnh1pSYU42urmtXlpVUVSVtNDP04FZdDYE1iD4+qheJSJ2QhQfq/vG62st4NPTnsF4PELv4p2+iB/fdwcX/+d8IRgEDSaNQwnJd6tu3H3LvORoip6MDOqbEE+m+yIXmo4HPMh+wVorZD/6ov/LxT4jzCftbsd4tF9SLXKgWqyotv/KVVfm7v3uK9TriAxBitNhIQ1B7gm0Uks45thHPhy4jRIp0RsQUoJpZBNBF3TvOWcxMnUs1y8YcjzOORs4AWGc2WoUAi3Ez72FOpGCaVeHgKFuODmelS7NE5OQg91+8dDT5rYPrl79w7eaNP7j+H/6Hb7/66U8b/l5kYGBgaEQ4MDAwMA3hbn758pvp4eH3/HT6PfF+3Wsrbq2wg4tFmb799iJ/663F+J13FuNbt1bje/eKyf371ej+/To9PVW/WKhXjUmrEKqkqgpflutGhRRFKTHGC8yAwUypWtBsDaCkSJAsUzceg2mK3RYnJgAa0e//R3P0Z30j8gRI7MOLfArJ/QO3CNZOOffqzrxPA9PU7X8eVmXR6AQGfYZ9gOF9YrtQ11jcesfqddE3Cu+HZ/YNEXKT/Qjf+laBk5Pq/WU/9ozPk2+1WNcWQ9AQghlgeI5QBC5J6JPE+TT1jUSSREBaBBAAqxuVrcw6IQCwJDGkqSWTScguX47u4EDNORiwr+7fZK2TCarjS9NFPpmVrVX07s2jWf4bl6/M/u6lG1d/79rVq7935dVX7+LvZQYGBgYDMjAwMMBPfapuzMcbyZUrbyQHB28wy+6T7IzH/n4doixDcvv2Mn/99eXkjTcWkzffXI3ffHOd375dpM2xvX612pgNXxSrRoVr5NfrwjVqMyAXZRXQwxq0kaSpprMZsrax28GBY557kHBmSHZKG7FRi130oqfsOyJg4JZunf15P/uDHf11QxDD0qVZjTx1+77A1BTnq0eMut7/7H2emP14FhQaEjHN5Pz1t7l48BAkn1eG4EJZXWv9xhtV/cUvnsHM3r/56NncrYgLUFULIWwUVQ0fHNsfiPdwacpGIls5iMAAxFZmFsy0UrUKQFCtYwiFA1aJyCprmwoeHtbJ0ZEyTbGHmfc1jy/X8fiKL/OpD/ArJ/LFSwfZf3716sHfvfrSC787Oz7+7KVXXz3DwMDAwGBABgYG/n5g9C//yw9Gly+/kR4fv55Mp29Ikiy6bUxG0vZOLLIQVM7OCv/OO8v0zTcXaZMN8XfuLOTkZOmWy5WsVivXaBfXsl6vWZYl+8crteyZHCXTAGTBzJlzzo9GzGczJLNZIrNZxizLAFAaZY3ybRQPEGb97Aexw/phn4tN1oV+hiTYX9uMqc6nkT4lLnjA5sUKq+qEgD3hSF7avvnoYzC7MHXjaJaL2tipzZKAWbr8zi0++u4b0Dqg43mbkAaLDx6E4ktfWuiDB+UHNB/gVqSIPM0txBC0UfygWRDrSXeKuwgRSpI4l6ZOGjVRKEL2/m0YaQ3RVEuu1+duvX6Y1PVpYjbPkmSZTaeVn82USYIWAzUmkyocXovh8LJUyVgj/TtZlv9X144Pfv3azev/vxtXL//ui3/9r3+t6XBeY2BgYGCoARkYGPj7iX/rl395BWCidT2OVTXRqroMM+6bhf1mEqzrgKqqEUJsxvVm3sayrJv1Cq3xCCGg4wLzYaQEszQAo9osD6ojpmmaTyYcjcd0SQIRocWo7WdRVQnANZLH9RuM3dG8fSOyW+swkk8p/QCfXByxEQFjtwzAVFE9elTb+XmF/ewKWkw5yWd0TPlk8wHsf4198wGhmRe1tFHuGvmIkVdkziU5R0kik4Mxjj7+ETYm8rmakI54fq7Lz352Ufydv/PAiiLig0MjLW4zHGpmuBAzsMGJUN5jLYj1YiPTPXdp+9vPSDbq/p2YqXZH6W4E0gRQD0Sp67KVF4nsHbCgpEQl6uwwFKMjW6dTaJKcJ2n22sFk+l9dvXzwG1duXP/slYPx14/+8l8+eRUw/CkwMDAwQAwMDAz8OWPx67/+yvLNN3969fbbP1Pdv/+ToSiuGymGDca9pn3Yjo39eW9tn4vMjAGszdJglteN2hiBLMkyObh2DUeXLyPNc5hqjPP5Kj58eKpFUasZDGATJQIozVgCCGaqj82HtdH2fua0XWxlpBmgO3PSv8/2C9i7NfSIdW3nX/nKWf2tb53xohOmHEVeuvwyZvmLBvCZ2Y/euoE0c4zqqHCimjDCS7tGl0qWZ5xOcx5MRpiNM0wuH+PKP/NP4fIv/DyQJniexPVaF1/+8qppYPkgfv3r5x80+wEzoiGoWlkUYb1eh1DXargYJ8JsNPJ5lrk0TYUAn206OvWtzLMxVcQQtKprDVUVGqmpdl0FSQCy+/6bsXNOxuORpumsMMyWlY1X0SVryTQmyTLN0tcPJnmz5WryhUs3jr90ZTr61uGrr3aZsYGBgYG/fzMgAwMDA3/lV37l7N/97//3R1oUo00mpK6PVTWzveyB7bSZ7l1jLwNwYbF5BwkjqYAEIK9UJ8Gsa0Yoqrp9164gWmNkKEsrVysrypJVjGmpmpYhJM04C808NgqqWWxkqqmq5rodZ+04bmNmQNqojTnM0k408wCSNnKXYCFAdAX5pGAPNqpOT+tma1LBnklh7/hemAWO8xkc06ebD9KMpuYYNJFaU1fF1JWa+TZWmji4TPLJVI4vzeTypRmvHM/QGBAbZx6sa5bzOeTaVeRXr+C5Ude2/sY3yvP/4r84Ca+9dvZ8zMdenUeMpo2e9jy3GRDZiOTTTIf217rw3raeUXYRqtYINEOXcetC16XR6hAreL9Ami+R+sLlpRtlb04no89cPZr919evXfr0C9ev/tbL4+Sbo1dfXb2KgYGBgcGADAwMDGz4d//SX1qyLMdxa0KmjY7MzD2hnTbsouwGGy4wH33jYdsIFZFo5ivVcWtAAAhImBlCXUNj3ChUFar1GuvVimVVJUUIaRlj2pqPSjUNW2XaxJ3pyBul1s3baJaZ9xmyLGcjyfNM0jSDczlFNkYFMW5iz5gk0oiAN7Nu1xdAomstUs/nIdy5s9rvrN4NLMQoWeKQJTMQDthHtpkOSyRo6srQSFNfxlaJqzURSTOZHk7lypVDXm90+WiKw8kIeeLMAazLmqt1Yae373KxXmN88wbyo8PnYj5WX/960ZiPR+Xv/d6j574LgERUhapaDEHtGUXrIsLEOUojdtvrLjYd7xu2IuEaEeAGVdvly6xvQLD7t1xK6s+RjVZMqD55MB7nX2j+jv7r61cPf/Pajcu/e+PS9EuX//Krj/aO1x0YGBgYGhEODAwMTP6Rf+R8+Z/+p98Oy+WxFsVlawxIKIqbujUG1tI3Hx0GmAD9pmvgnvnYGQ9rBOuutXMRA6noXm6GNqoZ1vM5tKogzsFUpS7LLKpSzVo9NgP7Jqi33ojmPWQ0Mo5GdFkG8d7EbX0VzWAhmFUV4nqNsF6r1rUBUAIRIgoyNlJt43YtkIxmFiRNKzhHxGgGgNhDYXq6fCSj9Mgyf9QddmsmMHgqhEGd1FG4kwQTGoVZnuBSW9txMObBNMckT5E5BwGgMaIsKxTrEkXRxFXBECLO/+5vQUXwiX/pn8fhh17B+2a1iss//uP12d/5O6flZz97iobnnf0gQEfCiZDP6IRoqqYxaohR6BycyLs1HfZuHRF72hWmU8yMWeZgFqMZ+99PRSyIsHZiksjDySi9PZ5NvzY7nHzt+Nqlrx2afff4f/XXTzEwMDAwZEAGBgYGnsxf/lf/1VUcjVKt6xx1PW7iMcymEEkoQrvghKgWa0WCAHu9NrpMRxs7sVUEXDBLVDVRM9/ImZkYYK24MzVQZQyBIQQJqk4BQSPuEIAbOk/T0a0nCTibwc1m9NMp3GSCZDymH42Y5Dl9Ty7PIWnqzMxpXbcxbZSwja1UU+ykqkm7Fssyhtu3zxCjoW9A+hmROgamCTGaHVJGCWTswIkzjlzQka80lUoTX0YnJl7G05zXrh7w5vXjTcbjyuEE0zxFItwaj3WB+dkS56cLLBYrlkUFjYYNUbH87ptYnJ0iPZhheukS4BzeAxbeeac+//3fX57/p//pw+qP/miOGPV5m48OIxljtBiCmarhCVgLG7bbsEgRNNDw3mFP0hN7kb1enH0T1EpFGEVQec+QJBXH49uT49nnL185/N2rL1z7vauXj798czL57uiv/bU1BgYGBoYi9IGBgYFns/zN3zwov/3tn1q//fZPF/fv/0w9n/9ABGYGwMxKUy0B2JOa++2Mge0cAVopyV3huIuq3gBvnekwa8eJmgm2GEQopAPg1MyF7X3c/0w2ct7Dpyl8Ew1AVRSo6xoQAWYz8OAAMplAsmxzr5Doi8BGUIXWNerlEsXZGapGWlXb6yQMsF4NjIr3GpbLk9Pf//0/tuWy7F7D/vfr1tI04Usf+riNj2+CXtTIWsEyGKKBJrDxOMPBLOfBtC0szzFKPbwQpopQBRRFifWqwHpZoK5qmBqeiAhGn/wwbvzDv2g3f+xHcfTSi0CeE0+iqjTeu1evvvWtcvm5zy3Kz33uTBeL+rlnPvYwoK3r0WK9rquiiPqkDEgjirSm0ed57tIscwSIp2N8hgHp5k/EDCEEC3WtZVmGsokVoMH7wNHobjadfnt0cPDtg0uXvj5J0zeuHx3d5auvRrw3BgYGBoYtWAMDA8NWrMXf/PVvx6I41Ko6thiPbb2eKJBTxEURWoxFZ0K4vw+/DdywCbvC8i7L4WAmnWXZDhhA1l2/DTzOX4iauVrVm2oagWTzfPdS55CNxxg1SrIMnQFZLhaYn54ieg+Mx1tlGejc04uPvUdnZlyWbbR++HCzNQtm6GdaQDqfJOInk1ym0zy2BmSHdff0sBBqO5nfje7oKDrOajXUqpTEYTrJcHQwaY2HzcYZ8sSbIxhDRLUurViXWC3XbM1HqCNghmdBjSi+9h28+cbbdvKJP6iPf+CTPP7EJzi9dhXJZAyfJGYhmK7XVjed7Mu33iqLb3yjqL/61bnO5zX+FHG7AnOKKGJ8ogGJZsYQNMQoXtWcCPeMRR+7YHtV3y4b3g0k6BxijCibWJKlpemDbDL5zvjo6BvTo6NvzvL8u+7o6P7Qz2NgYGAwIAMDAwMfgMnitVv1yx879tX6MNb1ocV40MSXlUwdiUiaxlh2hqPfOdoAogm7k6U2opmTXp5EABOyVRAgiogJoCT7x/SKmomQ3on47pSrCKQUkfHBASazGUejEZLWNHjfFTWjKApEEtaso5UI3hUkxHu0TRBdE1st799HXK1gewe6WoykmUCEfe8BEvbYmBkBQhU4f3DKbHorjI8/jNRnBwcjTGdjHB9McDjJLU8TOgAhBK43pmOT7djWd9ThXdcxbD91O5B1EYs/+rre/+o367PJqMovHVoynViSZ+Y0Rp6dFjw7K3B2GrDHn2T2o4MAxTl45xgaqSrtCY0LYQaNUWOMZo0gYv0syJOyGnwfdSHdTXUIto5RC7NlnWW3k1H+3dHh0Tcb4/Gt1ng0GY97TcYjYGBgYGAwIAMDAwMfDH7q1XDry//+LVY3L/u6PLQQpjafjxDjNRVJpTvFKMYSXWdpM9SAmJmoakLAO1IcILLzFEK2MTpAvUgQUvudxtvYP8kWJMSsauS8SBVV6whkbjTKJ9Np0gj5aIQu+xHL8nEBeowQs80c+03oemIvdlAE6XgM5xxEBMWjR6hXK8QQ0BmQuq7N6rqrRWCXvdnHAKMIYapyeufO7HA6nV2/dH16OPWHswlHaQIBGeralkXF5XKN1WJt5bpkDJG21zeRFxqPHrYNYqZCREGjGCPOFxrm58FgtdKCJ1pFT/szMR8dTgTOOXHey5OaErIroFQFYlTtFaNfYMQMHwBTRaVqpWosTdd1KnfkaPy9yeXpdyZXj795kM++lVQHt59zxmNgYGBgMCADAwMDp/6/KCcf+x89cjq55erqm6ZxUs8XuQCHJFM6BwM2JkQBqJlEVa9AIoDsZEKaI3Wn0EYhI0h2xqN/pG83JqBsEEATUs0smPdRyeDS1PI0RZbniU8SRlWUZVsjsUKxXkNVkTmHVAS6NUZQNOybjaeZEBI+zzG5dAl5kiAuFlgvl1gtl2YxKslgZhW9d7Z7/KL3QoTdGNWqTIrTe1dnLzf14YcHIg51HbBsMx6rgst5+/1LaIw06x8N21U02J4B2cMMtomd+bAohujaMU0JbSLUAdHBNhF/xhCgc46+NSDOiarGJ2Z5rCGEbQZE1bpidDwHOuNRtMbD6SpM3SPemHwvfXn0zugj43fyl8bfm948+ebN7/+/38PzZ2BgYGA4BWtgYGDgf/aXjvPa/+DERgdTmAqLAFSaoq63BkTENxKQCDFKUM3MLBXAeZKNLBHRVKROnKu9SHBkJGn9rEQHG7qlnhnpmhYaSPNkdI0S52xzilWasv3soizZmo/WIJTrNbz37fYsdNuzSFpnArgFrRq2cW++0W4sIuZJpiJwIkogQLVMRNY0K5s6kfN4eroGG7CHCPezFLpelfnx8Wg0nU2rsvbz8wXPzxacny5QFRWghv2TmjoTwt4v2cW+47FtNCGiA4LDNsPh2I51m/EAoiPUE0EI+7PMfnSwkTXE7XG7Zs+4V5yjd861kft+8j2iqihjtJXGuMisqF6Yntp/6+q97Gc+/E7+49feGf3Y6J3so7yf3Qinmn7p7H/zv7m/wvNlYGBgYMiADAwMDJhBvvWtV6hwrpjA3CvT0ofqEUJ4gzGOUdUfgdlIyGx3olUUMxMAQqoXiYlI8GQQEWV/99New75uboD1zcj+dqkWbeSBgBDWVhQoSatJlHWdNMZDqmaNIhi3W7MaJXmOIGIIITLGGLx38F4o0pW6X1g7wE5mhrqOWlUmqkyci6MsKxhjoTHWolpSREGy+37SMx8XZVg0BL33ta+9XSqnPptcqdeBoY4ADGLYxAsxoD+wvWu2+x/SNuZD0ES2EdHZZhzdznw0isSfvfnokN02LJ8kLta1WghmF39WG6iqFhslqoTI+zIfURW1qhWMWl4amb58JfoP3SzzF65V+QtXAqZUS86j828HyCOoisuyq94MnkTAwMDAwF8gBAMDAwN/ziGhq9WbMAsGEtXUsXh5XIePTB7ZlfwNpO4di7EMdS0xxswBSUJKJhJHztVj54pcpPIiUQDjntnYn2PPfKCHdfUmwEaKBtVYL5er+vx8Wc/nq3I+r4vl0mJdb2pC8skE+XgMem+7qu7CN/dny+U8KcvCxxgdYB5AX64vVXVVVbmiWHO5XFaLxbIxOUuLceVF1qlza+dcTecMPaxnPvYxkmgoinn86ve+Et68ewtVWQFmjXABvHDN9ta7zAdh6rAzHdyZkEZCbWMj7KJFEva8zccHgM45Jo18mjqK8EmfpWYWQ7AYo0Yze6/GI6hiHWo9Z9DTGxlXP/1K4v7pn0mO/tl/xF/6h34+PfrxH0yyG1e8jFKCpCodIELmTuSae+stCAYGBgaGDMjAwMDA88+A/OEfVozRkwSVKnGWMr44iS7WC6f17XgvjEMRUjNLtgXPDKlzlSdrithFJoLo0TMfe/MOQ+dGzAiy/9OmIcaoZbm27RgMgT7P0zTPkTSCcxbKMlarVRlXqzWbe0UEUtcVRqOMaZohTRM654Rkf8sTzEzqOrAoirY4Q1erSuuaEbCGmmbByK2f2DdMIty3DtY3VgTmM3/1QTi9PD8z+kOPo3wGAXf3cn9zWi8YYAB795m1wYwwlf3MBywINbjNWi/7QRj+JDAj3icUofNefIwWnBNTjXaR0TGzLgNiMRqcI56BbY2HlRatyID62tjZR18Y+Q9d99NXXpb88rWQTqYlnASzWjQGmgUBAsmaW0RinPkk+fcFeBXPkYGBgYEhAzIwMDDwla90P4fPLUYFQJiQ1dT79c3c1q+MyvKKPwkpzsy0ELJMnSsSkUpEVADsRLaR3My5m7NlOzeiQUSYpomMRqON8jwT7z0B9J4n9qCZOrMiJZebz0/T4JIEFEFdlhrW6zo2BsRWq5VUVSFlWbjz84U7PZ1zPl+wMReMUWkG16jLhCRm5s2URVFreyxVXReiWqCVWW19h0DC9rdd7RutRt1akWH80OobwWKyqk7w9vk7mJdL2PbX3tPWV3epC33zEQUIDtYIoRsLd1kPspW2EkL/tLde2QXSPXX/DLz3kqSpiHOCJ2Bb86GxjaposCd9bqVqC630dAqcf9+ltP6Hv2/m/8mfPJz9gz86Pfix75/kN6+mbpI5pUK1glloVAOINAtUpTRyMUYnMnFZ9lWH58vAwMDAUIQ+MDAw8D/9n4Lez3Lgk1Ozg0MzTqLGiZmNa6+z4OJYnaWIUaRSSU3qRCSQ7KoY2AZ2ANw3HzuR0pCmqYxGuWRZ5lrz0c69dyJCminMrJ9IkEZs6B3daxShZFnisswBYL1ex7heF7ZeryTGgr2TlBBCZF3XJGHeezZyJBuhkzMDqobGpNSqFgDTva1iGqOe371b1I8elXs7zPYbErL735PMrjyS+mUCAgPKsEJtwMiPkDoP7GO9sHfalTV0x+06dMXmFjwtCBDb6NlGqN/eo89h6xUa2FMHcYF90n58hoQbQIDWoDFay9MyJo0oJPfrOyqNtkSl8wPF+pOXUvz4h0fJj31klH3y5Xz00tXUH0wdvdCgEUBtFmsgFKqhUq2bWCyA03ORxUoEhfdJKcIiTefzv/bXvlrh+TIwMDAwbMEaGBgYqCpQZNUoKJAAMCgUJiZh6hNcS52zPGaia9w3sYr726dgXf3HfslHBwlzzrExHdwaj0TaOQCLMVpVVdKYCKxWa8QGwAxgv9i7wRwZAKyjahqKwscQgLKsURSl2zZMtO7zNphtC53b9yZJYiLURhSBOCfYjmlJ4rVRDCHsF8mznwgQgXWX+g0Ju/lWjKQ7d/EKAGfoLhpOijubySuzFzBJR+CF5sP6WQ8YYNyajyCw4LoMyM58OGrwQK/uA0pCn4P5MOz7I7O9QwPeO9zJOUfznkmauhijWV1bC3pYg6qabYXuzz+qWhmjrZNgxaGifjnzePlalr38YppcOfJ+PG3NLlWimRZKEwNaKUSc7nxuE6uoWphZAZEAktIKoIgcOzxfBgYGBgYDMjAwMPCTPwn97Gdh3hfBrDYzqFlUdD/+CiRORPSKiKkTkSB8ALgCyr2OGF0mgPtl1WQrMk0TJkmCLEs32iYjIKqKJHG2NQRiy+UyhhANQKd+xkGAYHW9DkBiIomr6ypRrUDGaNY9Y9o93xJCjXZ7lmqEc6IijI1cM26gqsbNGgk1Q4s8dlEXlygAbOjGhl6TwujgK9q459IgzsElKc7DQ7w1B16a3cQ0GYHgvvHo13yoEF2vj+CIvvnYxN1xu9HTNpGE4oNj1uuK2O0AM3wg+scNdwXp4r1HkmXOGkIIin0TsqsDqWO0CKC0aOs8WnkjspHEm96569PMH88SmzqnmVpkoRYjVB1IxwYjEzMLKuIUsLg1ILWprhRYw0wFIFTpzCRZLkE8XwYGBgYGAzIwMDDwhS9A0BDCO3DuI6YqjbQVNjKNKqr12KS+TG8Cb950fJ/BLakEYHtH6nbZENkuoZ8Bsc3G/8SjidzWhGMTvRfz3nnnqIDFxWKpMSouahwIKFVL1vUaZurIkIrEoIpAIu6e6aKSgKpKUaytrmvtenbIBsrue4QGmBkBcM98qCqsrrVnPuyCU7yse1BpoqTvvjtFMJrN4F0CjYqz1SPE84iXpjdxkE5Aspfs2L3KOuOxVc98tPPgN+ajKzo3beMHrfvonFb392jYYcbnZjx6iEjrSWlmzlStVYzR0G8aaGZ1UQQ6gx55X14xV19XF67D4UiEM5qlK6Wfh2gZJG49qqo3EQeADR4iiap6JamANRERqKPqPJIlgQizxDWRgND7zJlBSCieHwMDAwODARkYGBhwDozxoZJFNMtsy+7oIaujahWVqnFkTmGJCSIcOLqP4OeMu0zINgCGx00F4fYaQLQyEQ9SDD3nIuKYZWwwr4qoDcvlSs1M9gu9AXNAsBgLJc2LqGukwK6NutnOfJj16kegqmZWGx4Tt/cISMDMeq7C0EF2dQqKizq5X7AmIiZUBQxdBkecA0XgQNAJTov7UIv2wviGHmYzEXJrrsxUyEaI3HUxF3TbrSy28bH5sGa864AOGN4n1qkFzw82kt74IpwIE+8BM9fIyrJkrOtYq+paa62mdHrT5XwFI7nBTK84jwMT5IAkiJBYqy1CVIkhJCDhgEgRT1WHLaRzuZK+EWKj0MqsiMDSnItQVQFaZWxwIucOz5eBgYGB4RSsgYGBgZ/6KURsmCOEWlVLBaKa1a2iah1UQ2wVWccqN66PkS6vI13dNF8fmkAAAtaq3+CjUR+CFBPhRhd0lKM0ZFniJ5MsmUxGLstS67IqPfOxe7c5shKyNkCNJESgJLoict1/dv97dZht0z0NF5kPNGiMZlWl/bWO7v39uVOGLElLgI+7cK/Wm1hVJepGBgvL8uHqnfnb5YPVwzpqHRysTsja0yoPa2Pt2jEttHJATHbmwxOhMx8OUBD2fkxHv++KPacjd6WR24lbPQ1uEmLeC5yTykzPtIz3j2t38mPjg/kvHl0pfnF2tf6R0aX6Y9mBXksmNklSJo4GUjVCtUKM5zHGR1WM8yauNcZVExdt1Lo+DSEstZnHGJdxe8+5qp5HYBnN1iCjANhEkoKBgYGBIQMyMDAw8CdDjDCzRaNzJfOoDWYhxFgH1TqqhmBWN/MQSY11ngi9eEsM6qKZZ52fOqOSAEGgU1cjQiNbASLSP6TKSBiA3lYlJ1mWelWNMQaLMVoIEVuM/awJoLItXPG1mWBrQggzavchPe/R+z79DhxEx1N6lYS6tliWcX+9m++vMSIc1XK7ykZHZbn2aKiKAnVVmamqGGoHBIC6rs/xzrzSUit/c3LJppLWDoxCU8KaCN31+tDddqvosIn6fsyH9fUcu50/O9txMQZYWde6KIrwqJqH8+vRlS9NZ7g5Gcsln/mjNOOIDh6EEwNj7LeMadnGmqpnMcY0AOad8wAI1WpjPIAbXiRVESppCoQgsqyB0kRI1ZRmEFXItt1M5oF/3wGvKp4PAwMDA4MBGRgYGPj85+FixIbWgKgeqZkLIdRRtapjLIPq1oyYtYKS1JDS24F4E0KT2Koen6TwFYEOEh0E7MLTk8zQYSQIQFxDa0LG45FWVWi3YllD33xswnYY1cypqtA5cSJKVdAMPdNC2T3WRkWfZ5sPa4h1rQjB0IMXm49WhobDhd4No3x214VXsFm1GhqDGCJJo6G7n8Fq3FverstYuJvjS7yUjnUkrt7Vf5ijNdG0id12K22ivhfzYTvpB+/38VxMR1C1oizjvK7iPAm2fCFL9cMfOZIbo1F+GJzlpUOiDkIHGgGDmSlA9gv2SeHOUjYUFuOjACiAjIAhxrOg2mZBaN7PoiqiiAWyqIGgJGGWtkEAJTawYeZu3YLg+TEwMDAwGJCBgYGBPAeLAqxrsRjvBLPLAUjDNgOyjqpVUK3rnQKAKAKJSiJxLA7gokMafbSYFWHyMLV07QkjGtg3H21U2w4NwL7YRRL03rs8T914nG8Kx8uyEmDfHJiQattiFU9VLyLRi9BUTc2MWyCkNRJ0Vd57pqjjggwHTBUbAxK3Vo29+3pzoIsdBjs+q763HrlkLvaCF1EtNfRSM/DZKPNplsDMqvVyfVY/isVyzXl95F7ID8NxkmpChs50CGGd+ZAnmQ+SJkJzzlmSOHjvtR2LEGS/P0q0EEIbYWZshFZPgZ168/eCAlaFYMuyDHMBlkcjpx/+0NS9dDw6uHmYuaM0iX7FMjzQqj6BWUnV7ZO9k44N6P41+EZGIJBUA0CzwszOY4wegGFb5xFbY2JAHUV83GY/VM0cAE/AqGoE2EhJotGaIlPi+TEwMDAw1IAMDAwMpCmIHWYrjfFhHcI6qBZhZz7CNgtS7s2rejOWZjYxLq9Ycv5C8OcvFlwdVxYT7bIPBpIws74a0M+EWE8wg4hQ0jTxbdPCPM/hnBjQYRuRnReIVLUGEnCJCB0J7nCNhA39xEWjZ2ynMuym1khJymyW0jleZD46de/p7pFSq+uFvD4CHgaNiRFiINBKnCTjUeISRzqoS1OBE67jyt5Z35Gvz2/l31udpItQ0qDWbbnyjaTRvvkw732cTsfVlStH5YsvXitffvlG8dJLN4oXX7xRvvDC9arVzZvXGl2vm7X65Zdvxuae+NJL17R5RieTkXnvdn9f7Gc4XE+yZ0KehQFWq+qiruNJ2ViLUcaz7/vwBP/MP3Tl8n/7X7r58r/0T117+R/+xaPL3//J0fjKsff5WMSlIuIJeJKOQCtpJWZ+IyAR0rPR7jpphgaF6krNNgpmES1mlameqdl5MCthpgSMnUjs6v8dY6QLwXlVGJ4fAwMDA4MBGRgYGPjEJxDStLMF52o2jzGe1aqrems4yvqx8agalbu6kHZcNbGZsw5VrrY6Nnd2I/jTl0pZXCusmgQzQYfRTKlq+301DLgw7jqnezcapUwSD5IXmQUBtFE0MzZyXoSNxJNwjYRbsPUFXXtv9s3CBeajZ8wMkmWSvfLKzN+4MeZo5CiCnpF5agYlKXV9Y8VvJqan6pm5LE2S8TjNp9M0TTNmWW7eJwqaqsbuR2ieh3P51vLW6I/mt6dvrE+zeSgJs/0mg9A0TepLlw6LF164sn7hhWvljRvXqsuXL1XHx4fx4GCmjSmx8TjDaNQqRzO26XSkBweTeHR0GK5cuRRu3rwaXnzxul67done+/drODq0Mx1VFR+t1+FBCPHk+MBXP/eTx6N/8Z+4cv1f+2evvPRP/YNHL/7sT84ufeyj2ej4yLnEC8WBlEaeIinJpJFr55sIbMYQ8SCdbedbPa4tamWNgu18ZO+cNjUgcms+sDMd0ogCoBVUlWTgzqALni8DAwMDgwEZGBgYUIWZnZlIaapvBtUHIcZ1E1fBrGhUbsyGWR1UizqEooqxXSvqZr2NQa2KwUUrZnDzq8Gfvli6s5dWXF4pLWS7xoaxiaqR+tiF9BMj6OLuGluSJHF5nrVZEBOh9c1Bx9ZkKM1MVR0AlzjHVl6EQqKfAcF2bLiIC94fYzQlkUwmLm8MSPbii1M5OsrhvVyQ9ejm/YJ3jiquXir8N8fiTyVL8/HBYTY7PEqn4wknozG9SySEygwAKUj8yKXp2CkhD+rz7Kvz24dfOL919NXlg+ndcpWWGkW99+Xly0fLJquxvH79anHp0qW6NRx5niFJvGwhe79/2Y03EqF4vzF5rTmxxpC0kixLSNr7qelYh6BnZRkerVb13eWyuh/K+vTmURL/wZ84nvzL/+SV43/qlw4v/8JPTg9/4BP5+Pq1NsMlFCHABrE2irhGnmRK5zKK5BuRWSMP0slj4yEA3M547NfugMA+5hoRG/rRen9xsZGnNFQVFM+PgYGBgaEGZGBgYOArX4ETSeCcWIxFoxDNXKmKutEu66FRNdSNglkMgDLGaIAn4LjFSSujMGZA8HR1rizHMY4niY7OMk1DEsQ0qpl2PTcMQF/YRXYSIZPES5YlWhQOVaX75qNFyCjbWpBEzbwTUYpQzQCSu88DzPrPdfP+Wn97FWxnQLD7Li5JyIODhE0Mo5HTs7NKiyJc8B5wr1xkXHL5ovhvPUgQTeOVTZlLmpEg7hf3ghnQrMj1o5vZ1dklSRPPZbnWb9/5dlnXBe5Xi/FJvRq95bLyQ4c37erhkbfJJA+jUaquwYyZKpoRuN+VntxGXAxbAHN1XaOuA8z4LMMRVRFUrVUZo1Y7BZiFMQUfOs7dx1+ajD7ykVH+wotpfuWaT6eHImmydYwaDLAG7f1Redv+e8zpXLX796W7bVXRzGqQwUhtBdIARJiBpPV38ZFso5IUI2F4DAHb35HXZUV6ma/cJpOvJmaouucHBgYG/rzjMDAwMPDnnP/T/wm4detSproehaBNZBZCyJuYxhjzGMtGVapaZap1alZ7oDZAezKQ1sYGhaGRRAQfrcqamNWo8mCWkHSpp6QJnfcAW7AvkP3aCrYyVbUQYqPAffPRq8VQMzFSGtSJGBv6WQ0juyHtScXjvUJzNcO6qlRjNJihVdfBm2kq0gjeC2O0hv7z3E+KgKQPFsYBZ5FQTf04TTJH0h6ePqjNoo3Smb9+cC3J01RS5+mc46P1mdV1pQChhFSmCZLJLNCNilAn82LpzlYLrqsSQRWOAi+C7vP3zMdjc9KXqrrFYukfPDjlcrlGf3tcZzbMrApBV40WVaXzqgrnZRnauAxVLHNjfc1n8funU/z4i4f+Rz58kHzi5bG7fjlxs6lzaQaKA2CmGmEWqRrQyNoYQoUYa2zXappBSEcyEREP0lsjAFQSRpoCMTaybayVfGynSOlmto0gABVxFSnV47hRKZI00RfOpaVzLL2vlmnq13n+hQLPjYGBgYEhAzIwMDBgqt82s2OYsYmVARZVHzYahxhRm1kwi7UqolndCAasA5B7YNTIG+BExBkg9nj7CxETIhwQRVZqMa6qSaXrUQ2f2aEkMU9pFAI0EtavCyFB7BARpmnSytZrQYwRJPY7pHe1INHMayMhI7fvIcwMJLoTsHBBNmTvhCtrFVWtBWzo/VBvm6kQWea9c6JpKlyvo61WASEYzOzCuhDSfI3q0mn55lLnxUrtJUnSMUgYiKJe673zB2EaJkIhz8u5rYtVNMI6GxGh7u7iLk7Lc6ZZykhFiApjgnw8xdHBMWaTKdI0tyzNME2yOkuS6ES4dU7szq41mIFmKkVRxvv3T8ODB3OEENVsm90ws9jGRrWqtuNWurNbnDjPG6Mxb05Gcn2c2bVRilnqMJ4IswnVw4JVkFBaXZcgYaoeImyAASZmStWAFhHXKKFzOVWVgAdpBCLISLPKAEfVFYDQiDBDA2kGUzVzrpt3jfAhJPq9LPf8WKctpBINMYpTheL5MTAwMDAYkIGBgQES9sUvAmb95uQBwErNqgD4WpXBDFFVmxiCCJwqG6IB1ijfmZAogIBUQwPpaA0R0TRPEZJgVVWvVnWh43odRtXBKA+TNLU89eaFEHbGw7CFrRrEe9HWhCSJN9Xo9swHHndHV93WgoiSjmQkAOtO4uobj27tYvMBM0OI0XS3LI1MpAlUIU1JiHOEmTDLfDMWTRKnRRGsqnRX89J9lqHXiJ1KnZ1Vd6vqbDk/SG8m3h+rRh+1jg+Wd8pHKwcQNFODdS+AGJmAzkcoV/USha6xucUUpMDCCvX6BA/A6CJXR358djkZz1Pn1bXf0XtHEXJn7NBAVbPWgDx6tLSqqg2A2gYoGqyhl0Zh4kSujvP045cO/MuHE399kts09TZxEiWijnUMMcQYC3NIYOaNTCHiYBbMe2/OOelOQiYhZsqdpdkVmSeNMpAJzayRQiRQ1dHME1CqVjTrPKXtpDCTXhURzEyN7PJkBjMKwJ2x6XsQY9cHRBXcGpmbhufLwMDAwGBABgYGBvIcFgJUBF3Dcm1lVqlqNDPRRtEsRlU1gK1A1goUkTQCiZl525ZdFIH0ziwlEBSIpjpXZQLNZ75Oo62reT3yB+tRfTQa14f5KE7T3EaJR+JAR+nOVCWxwTkH7z2SxKOqKpj1i8UN/ROxSA2qXkXEkRGd6WCDNWyjEqB1jqBvPnZEs1a2Mx5QEp0RUTaICGJsh0Cr7dHBQpHEkiRqXSsaWbd964IGhuk6Lo6r8vVsLCenaXZjYcXB1k6o0mAwbFCYd0mW5lku03SCkc+RiMeDxSOcrU4AEBQxAsEV1WIc8HAW5HQU63XEOYpeYXz/87vhfh1MbxvcBqQiPEgS/5HjafaxK7O86duRXJ3lbI2Hh9Rao6rLXclQYF3XsAZVt5GZMxIWY22qKZxzBsCRZiIJu9OnzAjSwbmMZqCqEd3WPotQTUy1BBCpuqQZe30UFaTatielGWDdX7vtlb/0itYNDTSDYINQdeMrdyVItx2eLwMDAwPDKVgDAwMDqjCgy4K0gpkFI6mA6tZ41NFMrUG3cXtFtVLVMphV0awMqqu6jWarymzZxDJuVUTVsxDiO2WNk6pMT4uz0TuLB6NvP7o3+vbDB9n3Th/52+cLnKwqXVVRQ1T00xMUeu+YJAlEqECHoYMbzAGRgKmZByBdzUMvGkh28ULz0ahUVSMJNuyibAMgwi5u13q3OQfxXlyWORmNvDSRaeronFBk/6QsOLU4W+rDm3P71rXov5tDlgS8AlmjNDbRKBmFMnZjXBtfxvXpJVyaHmAyniBJs+gh62nk3Str++bNQr55tfJ3xlHWBDtzdNGRwV1kI+zUsg1ehJeTVH7s0qX0n/zwi9NP/dCHD//5H3z54Bc/dmXygy8cJjdmOcc+CYgSYs0QasbYqkKMBep6YVW10FZ1vdKiONeyXOy0bNdCCKU1iqpBu8PRdsfuwrkc3o9a0fsxt+M25ptrIhmALollO9Cgu2jWamtktNfoHl3cGRPbjLfr1jNnGTEwMDAwZEAGBgYG/mQIgSpCJaEA8Rg1M2ePDz4y217vEgkwa5e1goiTx+UVZkAdt+NogHa7pKB6GgAS9KH2wkIeVgs3WeX1cTaKR/k0HGVTPczzOEkz5l6YOJCEcwLvXRMdev1EQBJb+idiaTRzrZyI0Rp6h1td0HDQ+o6mNrPqcd4E3RG2+rjexBSANFKAQlK7bVYkrDMlImZJIhajoR2rGlqZYZ8korq8dvcOvTuZJzhaprxW0GZlqDODIdQ15jY3RLM09dEsVqFcrS7XPBvFdD6OsnLGSIBoEdkOSHSw4Qnd29lCR+LQJbiej/HibOJfOJwk14/y9NI0Tae5c/m2WeL/n72/gNUkybJ1wbW2mft/ICIyK7PpMg4zzwivaHhGNDwjGmZm7JpH/XRf3zvMPKIB0Yg1zPiYmfreet0FmRlx6P/dba/ZW24m/YqMUGe2sqq7uu2TVq1t5n7+E3EyJJ1V27fbph2+OVrbsG2pSwaQ0KXXL9h3iRRqpSTIfQ/PoFFlVljrUkIwa8VscQAiaYDxGDpfCFhuQ0q10EX7LrpvIG8AVARyFxIdMNfkCBki8P7ZkeKo0wYkruHjI4jJZDKZAWQymUy+W0rBXqt5a0hAws3YADqAkEuiS8q1DoAQ093HyG9zwCgxQL8VHepq+Ldf2yA4nC9trw/tmb91ftvunr+yz9a7/bP1Vfvs5pXi8Sx/s668WQwmFTOUYti2D4WPRAwK0FwyhdDpyQgMpOviCjM2kpfW2g5AkpsEXv3SbiE/nOEyM7g7x1xIwkCkdNUV6bVkJkgICYm70KEZFsf2+QU/+tT51cvJXj2YvT77vproZdv2ZftqWx/KyypeFueleGmGDnn9+NTHQ8fYS19o+LQu+uX1zn/h9ha/dH9vv/Dqpn7vfrW7m5o/etWC3Zy+X8AGjEDQWkMEj9BFoXS2lp46w/0Sois4uhwXlVK9lMLWKlq7xdHRaGa2hIpIhqqAEjIGUAA4WiOlEXhXkQvcQUAJusajWFdHvhDughkBjPAxECSZu/qeo6O7O7iOWClMJpPJDCCTyWTy3XA+Q4DBzNxMTua6kHQPF5AOl4YAMneJMdwrMTxrKnT9G3/uC3Ac+1KIEgaQPKXcvdjLdq4/ubyzW/6kfbLctc9P9/vnp9f63ulGt3WFebVdFYLhw/MLBFDI8TYsS1msIV2HkDBhFOk0M97f39m6rnj37h1aexGgJqmEc4SO62d5GAAK5Satt4ZCfhUIRifFezhguCBxJCZcMRZ1x/aq6ct72pfiagBhgBDqEWN8FlIf6XYMF/q3RiF5y6JP6uq/sN76L9/e6bMIHtF0wqvTytu1cq3mtQDm1H6Ba4c1G/kGoyvh3kI7M4S0luEjfaf7Zvv+En52wCDJa91d2tRaaaVUlrJchYYb1EqQRrLArIBc0gEwNc70oNTyc1HKLckTJEryUHMJVODuKIVwVzhG6EjHh3lvTuQqzvV9YTKZTGYAmUwmk++GX/xF6Ld+C9o2wIwCFgBNZAXZBBSXPJxtdEHc2ccZDJKFF7oTpRj1td6Eh0hJvR4IEgaSUspd7HxoW3m3P/EvP/7E7stN+3x5hV843Z5uy22ruueiu8upLG2xqkIACvH64D2Tmh8hpIxX8vYQIh0+1uS6LvXNm1d89eqV1Vpva13avv/4sm3PraevErIeVoyEA7p6BOtIbtezJSRGh4UYCcbUh24MSAOY/hFGsDDBe018m9AxrleY7s0UR4z4L0bo+OzmThE4+CZCx926Yq2V/fAQwaG2HaHDGDLs++E9T12HR7g7evDo4aAx9wEPv/i+qwdX91yTxWs9wb2OVAozg1QJUGZFpdTwFWYVALsEM0C6oLW8ljoBKJBa79QhRcAoORKpjP8k6gFlJBGQI2QoNCijlgSRcHx3TCaTyQwgk8lkcrlk+LBGskmQGZ1cQ83NSgMEEn0gnRqhw73AzHiED0MphRIJEO+HD0A4REjeaxD9Tkn4EGLz3b70GE4/P5R/6LHWN+VmfVXub1/X1+c39f58X+8uN3baIox4RYERIMYreZskl8wBCpBIuIR0MChlKbe3p/Lq1R3v7m5Ra4U71/v7V3etwVv7Sdu2R5dGWnp//mM40wXIewhJU1YpQFlpzGa447r7gg9B8mtL8jqY8KoGrjsdldAJpohT7Rfq0j5fb/R5ho7TLe5PK07Lwgwdxt7GcsCbpDEWM74dZUaO8NH3UkiuOiFdzlyPQwQT90eXFGruftMyXLhX1XrDwEij2WKlnHooKBkuWOsKstKs9NTYADSUksFjSVd8DcgF7nLAffxoS8kVGd67ITZOS28AFDDXuAbWXcJPj8lkMpkBZDKZTB4f4ctStG2Qmcbv525WBUikh9MBy7VLBFAYCq+QDGSurYcNdpeOPQ9XOpEFjGmSYzQCSM81g3F/6NgDzGG5s/tWfxL6cns8reXL9rrcbhFCLq/L3SWCyMtdubnc1Jt95eKVELE3rw6YSqHV2mCGUGEpJbsedjqtFgGEtVaR5u5QiICtd3ev7j//3OBuL19++VbuPoZfOgyJV2GEwXgMS/3a1RADRjobcyAB8TE+cJI6R4ob++zpowA6Af6KtX3PrH1a1vbZevLXpzyj4wZ3GThCpScJCNTW0JAYQF79VcKd49PNKCZEeg8jKaYgIXSED/fjllKqA06pmfturb3dpMvufuOtLZ7B1v2VIYGx1hPdGwHJrGS4GEFjfC9ITSEe15a8RrMV5Cok2CWNe3PLw60HXPBYl/FY1jUwgzAA0eHTE+w7ngGZTCaTGUAmk8nkn/JPgf/1f33xUqRtc5F0cg2Xm3nviBjIFi6NR64O1ZClcDhhlvuJRo+A3XsIUSrXfRSiASD7dZBFkhsphcpxjztZCRAdXcq7/bK8a+9uVlvbfQSP+3q63LX7CCO359tyeq6lvdiKfTkV3nmtr1BuTsZlZTnFVq1FpZibmVqDpBTcPZW1xX13N59/XgDUy09+8lVOV0OiSfLr4HHU8qtMMLosShhcPXfWl1ngo5D8WvggKCOxALoB2iuwvSb3T2j+aS3tzbLqLoJH5DAtdUWxQjMDQMPe0OhZJ4ejdyuQVYiWTsIkGSnuO3r4QBY4AkLpnQpDhwBVSmUA0nJtRwDZ6H5maz/eW7Pd7FalrJLOTpqVctta28r4d9AfwcqQAbKiBx5JRvddx0npuZ9aGYJ0tG/MXIDBXSxF4Q2l1NEFAaAUjrVjALB/7TVnYTKZTGYAmUwmk58OtS4ObE7eulmRGQSUUHOyhFwkQwoZgJoiUK7CR2UAgEgDZIClC/B0vOe8mpAA6UL/StIgyczg4SRhSCB8bci9gOf64JfTu523i3/Z1rbut0t0Q1hfTmZPK+vl5rRu97a8e1VqvbOy3rGsJ9qygKViBAFJ14K7W9xze/r00xKc/IsvvtK7d4+SOJ43ei+EJHRSIz+kK+z6Dz8QBl9/UWy6atcJ2F/D9leA3wntnmifFPO7YgrhZqmqpYJW/UhwAPYdzkYxMXcQOGoGQEp9D72GpUiWcAEyyfvPPx0oZQWgcEIaXRrGujL3zQpbM5PEIyDsxWyz1p4NeMng0Vo7OeDm/qplqAB8zGRo9JGOf4dV5OhqGErZ0OdDegek9vM6VgO0S4C702xM32h00ZBr95H5oK6OMDCT0iX4q1cQvnsmk8lkBpDJZDJxX9WaO1kaSQdqM7P+C6AjFF7crLlE9cCRAmk0KwzHOPEOCaRQOgFXd/Q9jDXp41pIiZnJAWE80gN87RGZ8T1S1gMD3Rou9uyX+nx5PHGzu3q218tj2dbTclmX5XK71u22LufbWl9ureKuFDtZKTe2rDe0shA0QsD4zPRSyhpzIp/m4EJblq/26IZo286SCMlNgl/9xe1w5o56srma0RiMx6eQ7mvoBPrdUbd7qd0C+13WjH2jVgKnYlgKUI2JaAQkoDX3RnmuKBIEaKHAwsHkyi001nasaSTSdTgKIFOQThrNRImQxl/RhhD0PGaU3NyblbKHb0U6FffdAG9SBpHSYt+B3XtaGGM6IZMdzZusRyBF74zQrIaOWZEMROQKdwkApesuiOTu4dRYA4eCrK4P4UTiXpghB2iYTCaTGUAmk8nkpwAJ/1v+ltvmfvFSTPt+ctJ64NhDrR1rP5KBA2aFKfJaRjMiHInZ9QnUIukK0nEdTiQHKeW+u5NUYgBkBh5fa8QVksaaR318rtTXx2ehla3Jzi844UInzWuxVq20tZYt1E61bqe64D5yymd14b0VLEZVMyfVZL474aKJRNGK2/qJn6z4y/kLGJ7hDpmLdMkEBXBRhNyQQAWUAb4c4UI1VIB2G1ql3Gs3odMhLYRWUjW8kCgcU+EjbJByhwiACjzcJCJ0NQtPJtJR94BxPfeRbj2QFNJ694Oe69BVEAGtN6ZySRaGYDYekxqZRkTgnkFhN7PFyFrIUwFeiuSNVAOapA2AUoFD0lUIGeFmSJAqevhI73+GlWa3pTUj4BpD8WZH6DBT4ASoxF0JpfE94eOpudw2a46APJn7b7Q5/zGZTGYAmUwmk58CZn/9bvZPcDMLnbwUat9NZKrJTOlID5G0UEWIgIWOEJK15RIph1lJh7s0QkI4gtH9gPvojByfLblIoM8gjNltXEMeJjnTx+NcpPfa2GdH0ik1OgUve0NpDThvuCEA0rzCsNhb/GipfmMVqxVfrKgCO9guO9Ac1kg0EXdN/isPu//ChaQBDlePPt47PKKkKriFiiRDOlQP72Gk7/e/weFCgiNFpCO99ezxXieIxMhglmtAG8kmja5HOnis+92EHWsQyBp2JEhrgIXTcw2YehosJAQwZCYZ0o/5jCVUUiCpEAJTUEpz98XcNytlTa9mN9X9sh/37P3NWC0dQJgcB0JCsgsY80VjBqW7Sqk0uzGgQnoBwHCNMJPeDyFUusLl7qMD4gikDzwep7MD32OfkXF8d0wmk8kMIJPJZHJ/j+Ze2r7fi6xOnmQGkQ5yQ38lr49BX4Dh1WKPh+oYFgbA699DmZ6XAL8OI3k/JdHsWB/3NpIyQGNvxI0rCMl5XDMC6Q4SJhmz7ns0I4+Aw74HSL0AEWinC7i0C368oQAEgUIwFwuJWwEuJJSl9T8sIVAa33REoaxzG0QiQt3HNxcG138QjSsSepX+TbtYEnkEAyA9xQAYIcQ4wg0putPGY1pHbYUsBWA1Mx83piSUcByhxNIhjTBy/PfnASTHsd4ZTrKGL2a2FmAt0hK+NcAFNEobJHkgQEHrQUTXoSbrvi4I8VDts0erkRl2XnYSdBf63BIkMYQUIF25Ruh572cOs0215voP4acUPiaTyWQGkMlkMl/FS97u7oubZfhYRMJLQSulqDW3UrwAAtAIoI7wUYqNjgjNmKB3MNKzQmqMa1tYuiSSQkoaXkI+vkaHg0cNSFknaWKKHCFFSgAa4AzHsZbG/dJ1CCGuGesRNYRG0CRBMHT86jRFhVNZkDjuQyphrq+BXMLXELsLuK6+tiI+CEEuBIqlm53sqEVyNQA85EhJm6Td3ff+y//oEpUClHIEDfPWUPsZIC7BgawhdxaAGJJAKd1w9QICkRaUdC+lWmuVsTZpreSpSvsmOd2f3X2XtIUaQnJ3AO6ALMQQBsB4DXBND5WwpZitBpyMfDYpjOOQRMCM0MH4+yrw7rn2wykkMBycIP2fhMlkMpkBZDKZTH46r+L9O//OpZkVr/UOra0y21kKWasotahQzFRKaVXSakEsZAb0syKQKoVIJI3hZaaRCHQlZ7hGiJAcWQNUcD2wHoC4gmQPNR4ikZV7ONEDR0gjzFAixudJSBhS2HB0/DBe1dAIGkMSroMHUlf35/obIH7Du/m1DZ5odlfJu1LKqZjdmtlayGr99bhjbkYkKDl68ID7pbmf1dqThxrwMn4h9yPNpeSA9yBiYuBu6CGk/50TmHIBETDiQD0qoM8JjaBg7msUp9raSyHdgQuki9wbgCMY9RCS6t0JkiOC9hU5zp5hn0VazOy+ul/6qeiitIuUjugnOz6XMlOCEUIAZemAA+iBEzX0LPKXMJlMJjOATCaTyU8BEv53/V2f7qVsLt14KQtKOUEyttbMvRmpcFRpL+5eSJQAZiZSTkKHePUMvwgooYJjX0wnDdLojjQCDDkS0iGNwePjMzDoHy4dTqJ/DnW40J0B3Fu/aNdBRuPAxayvg0buj7p/nxE0HO8hXdfCx5G+zf7VNeIKs7tC3hSzN7WU2/CbHkByr463kQ2BHCFLCHm6+8Vbu6i1s+/7475t75r7Y4tQ0EaASyWkHID3z1nGb+juSpmZMz0FiGbsXz1yk/UAUo2sJbwBa5HWKj3vGYRCfvyZNrW29w5Ns3HwYKDgevqHZulmZO3h46aa3Vb3DA0yYBNgLuXnN5hBUqGCMf8BZJ3K2nMf6ehIN77vcEwmk8kMIJPJZPLTYd9/6MvypwVkByQDCNiaWa073Z1mrbgL7gXkHkKxoyUiMxJwBySSOFCCEEklBDT2+7D5cAJolEaggABP59VLbB2Bu9IEJAWSkBrBRkLQJI17DZLneiCAX+tmXHU/eteG+nC20Ieigr5d+BA/eudVNTgCxetayqdLKffV7LaUksrwkRqdDyNgDAdAkKk0jvAnwF1qGUTavr+ybfvEt+2hbdvbvbVHAbsD7mMqPM2dMPMAy/iEWJTWnGRebw6AgIXJxj25II1kMbNKaTFpLeSpSOcC7M39SUcQaZI2b21Pl/sealcBCrqOYqR5KKhWyo0docwK4A40SRmovjgDl9ENC9noeDR3Vynev09F/zoESklPXgqIyWQymQFkMplMfjp873v/HPvqqwdt2w1KWUOFywIewWC31vYC7AQYgpGwQOQRQkhQcgcUwgge1+FA7qM+Qoe7I8zc29WZDIA7MOohd1kPCbq6JoA6alEaznQB6QgsJI2ux7FHSR8MD/7xR6CED6Pu3/2jV0ew+GQp5bO11lcZPmqtd737sRYgtkb3gyXcQiOMYISQEUAc8P6Y0275ObU+t1pvor61CCK+bV/J/SXvaeMAQKYJi6Qx4O1JuLk32/cMquOMESkvHcEQI/AFxhEY3E+VrAXYXHr04/tdMnyotYvv+6ZluURdPbD+/YkwwClhzB2Z2cIMZLV+spBrk5oBu0tnc6+UfvNlvJZX8h6eFDQcoafmKpRcHLjH+DdxucDxc8RkMpkU/BwxmUwm/4X/wr9y2bbyatvqLXB7Jy137vUOYNR2j9gkeQPwFJ71YkEpC0spoQrSFGIIZgZyHFBoDBBKS3j1ilReDQRjhJT03inpjhRC7o6sBaQnQHd1/KgZggNoEsNzTZH0vq+vS/hwABE+hAJ8FOmbhg/pw4PnZm+WZfmlU61vlgggofv0DCHV7FRqPZVSbmpqWW6yjr1YH56yfk9o7VqK2cJSqpHFwhmO8TIBSaHdpdHRshEklCJHx4hulmv1NSAlnkJqzHNIzcdVwEO5vuwAVMontiz5dzqx1tVCNCtjgF59NoTuja01RI0MKe4ZUja4b5K8vwjhNM4eQciOwPXYSCLYS7GLGc9m9lJKOeeaZHh5LqWGcv8mrpd3pfzhhz//5//PO757JpPJZAaQyWQy+Xf/u/8czPB632/u3cuN++kOsFtguZN0565Y4wTwhkSI6/H4y4JaK6JGKaYjeKSMh4hxNsiBIGk4pQYg3enuGMr1SBDD3bP2o3QhpLFoDUof4eMo4V8fHv9G8Eq/QyR8HX7Dr+F49KrWXzkty6enHjyW9GW5Kxk4Ilykh04jXBSzk/Xaukqq1ry2spQl1zjCR7VwZIwMESNoBK3tdN/8WBNX4Y3Xb/8ieTU7o47L3fv8TbsOJE5m3RTu0qWll3JfSnmdYSn/vMxwRBYCwvFZLTy1w33nsZd1G98HknA1b0JyCRnCzf2pAZtI7qFL6EzaJcNGull5MasvtS49gCwvp9Pz28vl/uEv/IX/c8N3z2QymcxHsCaTyeRP/snvb7/xG/+lzQxutqoUk7vDbPdSliibkwBJucOBvEbrnY+s0xX4CA2A5N4QEqDr17fC/ZAUOqC7Uwe4ChxX3RFiDA+jo+Dw6/VAH+03fJsux7fvfoz9b9f9eB/yZMvySYaO0lWP2Y8cul4tlMHBgMpYjFkLkImlwyxlIoFQf/uUCDS1tnlrlWRtpI2fd2rf92flTIi0CwciIXcIUCFlrcEANMktQ4ynBSQs98ajWAqAUMesmPtSjlfyPrfWvsj5kyUH41PxvZ00SFv4YmRihoAsSpfQd0soA9gNMnxI7lKzY7DdQBLuv7S4/0M7II0gBHhw1CFJmwOXkIXOIaBWEJPJZDI7IJPJZPLT4Vd/FXx8/FffXi7l3p137nYrMXUn6SYUNW5IngCe0i3jRy3KEJKKta66H9e/eI/h8kDh3tWQcnfm+pCYck+1HkC8hxYPaeBH/Q3eJfXhHf7Ow0cifZdzH+9dI7lyXf/43bp+sh6PJ90vobostzWHrmsdHZBTqpgtoWqpHkSuVBheSqkIZ99LETAmABH0uYjmGU72/avN/WUHJFLXPwwlYd7V134YfMxZhHx0RAQ4pAagNQnB7uRlB1xmr3MOpT9CZTjuTY1BceexlxfBI9iOfy/AeHyslMWODsoRygAIMEbA2YHzheTFzM5mTL2kl5Lr8myml1prPor1siz+bt9fP84OyGQymQFkMplMfkp8//vAf+I/8S9aL5e71xJu3S3EW5I3Eu4ARY2TmZ1IW0JrOWApS4YQmRWQqUJgzGiAWQe8epxGWYcjnKGrXygd/Z6Q+h6YtXT9FqzUNew+ECR8DF75d8zH5j4+jPT18AGQtf7iaV0/W/Kxq2XJ7sddzkiE34ZuSgSR0F3W4/EqK+VaS0nvj8lZn/lgrsegOpkiAKVd/cLv/Y1UF+37lxdpbyNgXJ1S34DRQRjXkO6j09A1gogARyjX4z4Am0LNDH686WshaZDGvfv490AJBgjj38NQ7jHoXSE7PuMIw4nkOvzdC+lnEn0GJMPH8QhWeIjPZn6utUUIeXr7h/7Qf+vd978PYTKZTGYAmUwmk58O/5H/yJ8TcP963+u9hBvJbo/wwdvQDYDbHjxWM2YYqaWM+Y8is5QJnR4+OMJHCICPkCFpDzmlFvJe7/2aLNTDia4/T4AgUeT1AXXo8LfrZvAj+/gW+wG+KfyWZ4HQLDsc+dar1zWDR6oHjxw0t/CS9breWnZEjkByGuEjw4b1sMHwrmK9NrLQAkAiD0/17oda29PdPbsg7zbpaQd2B0ZwaCNkCDgkjbWQHvJ+PcHYB1LN00nPukkbgMtOrirltpDG/ufpsx4boyZAShz/pnr3BgmPv/OSyhpmpXd1fIQgd395Ic/nUvR0dELwYlbO6aXwZVnsudbtqZQ11r/19vXrf/gcAcQxmUwmM4BMJpPJT4df//U/x6++evNKKnet8VbSSbITaTcAb8wQNY/fcPtzPAFrrT6G0EcAkGAI3DVOy2bUlGQ9dFx1Q3Ye2nIvXHZc89AIDYWpMWQMwMc5E0BCMBi19A3DxLff13fY/Xif8earWmvOftyV0FLKKfymdz4ORW3h9dg/jf8k7I9WIcTUEUQWXj1+hWPPEHAECA+TGo65kItLO44A8uTuDxlAerjYPdTyGrClN+kIJeE6pH7vCJkuwAkcQQBokK6DyO4poDXyRLISgdS69hAJMDCTkJ7q4aNwBBCzlbVWkCUEl8afZXP3ywV4eCL9xUwZOs79Eaz0l1otwscW116eavXHN2/+4afZAZlMJnMIfTKZTH6KkN/ff/CD/8F532srZd/dz5uZbxK3UrRL2Mm9Sd6AsgPNSdCsoJSiAGZkGMPhLpKGkJEl3AW0kDlQK5CfpdDu7pcxB6IQAZCsRt6ErwRWpJOVQAFpp+Nr3Un0V7WmLvlZDjS5v7jk+q7Cx0D69q/c/bZhhiwEGBgOEWYWKqGKWitLOZxcCBDXbw1Dp39dioFIpPkRDGv4BsB47JvMCo97DWSxUk7cNiOwCXC/CnettTQzBGZrhqU17q9mtQBrJa1IXki5BAHeuy1Qdxxhoph7K+RX27b91pYhE/DxOt1QBjAnQAt5KQyKQpmA+5//CF2AXEIhFwEoGZSkHG6/t1Le1NZeFeBLAa4egsKbSGThwBpm2vcf7JhMJpPZAZlMJpOfPv/F/+K/hZfL8kbCXegk8cbMVsBOAE6kreMEuK7rN2FJIgFY73YwHcjacazdJO9rZwaHlLRBascHcDHyVTk6AW9qeMkTwEt5HZ4D2fclBrNLra+XdX0T9evldPo06k/XGNpe8s1RZnn/nZndVqCMIw4/eoo5CeK3RfoOX7n70fvJtdT6qr/1arXjfI/xet3Val2z7l5HYEhHlD105Joa+2OvFCMguDfvP3el7/sR3LL7EbVae2n7/hz1U3N/2vM+fBApdYTIq7NDrpCcOuj3tzEHoqxJT+UawHkHSnhlrqVdgArAoBhgfai+D5yHp8bPw2xB7CMKkArGierNo97cHx7J8xPZXkrBi5ldQlk/16pwvSzL9mT2/Pjppz98mR2QyWQyA8hkMpn81OdA/rUGlNdHAOHNETx4W4qt5Hj7FVezUsNr7KcYeAgB+0SBScr6KpB4+Nh3pgPpLmCc5XBXzXIYOU//flUySNT6KsNHfwXtXQnvynmIu/TQqfZ1PYazb2N9n/cVs9tCrgYIfY4BCtAhwW/66JX0Xbz1SpDw8VcBQ4rgtZaSsx83faYjtbL/kh0a8xwFV8FjKC0YayThCloqQ0dr7aKQh5r7OIl8C39u+/7S/e22719swK7fPkgdnwswMI5rkiOV1eGpIxSQArkLEFJkc2APGSSFdrpvHAHErITXfgDmGn4agYy5lxqzSICjz7KgPza2uV9eyOcH8pLh41yKLjmAXqu/lJJC6Px0Oi3v3rz5wQsmk8lkBpDJZDL56fLn//z/Ug8Pf+m+tf21O26BctNDR8hOJI/fiK3UEphx4Ri/AMfp5BYaMx/XZ0KENwJCroHjPgChtZKvl1LeZAAJ3WeHox7rI3T08x6slJOZrSWdXDjeABXrUC3poX4A3006j6+5KUClexOwvxdAvuu5j49+zW8TPsbasCxvluPPvYzB8vRx+rz14BFAAEQKWY8QkyLdj7qNV9p6hgz3Ta2dwy/Z8ejdiy3qc+h537an8Md2ufzWubWvdkD4Zgg9hIAsRCCJI2D2AJISmd6yBuk9jCi4NGD3PreRn9cDyHib15qyI3CeQkv/b7+MxwFBEgqO8HHpcyv7Jr08S4+P5MtzKf5Mjlfx4iXXtbYz+fbhdLp5+vVf/8EZP0dMJpOJ4eeQyWQyIdlOp/pY681LKadtWdZLraetlNS6r+vpEnv7spxa7DezZSdNIYQIkKmsAwNSuQeTUMJSi1mtZClmaz4qtdSaj059b43AEXXqkxp1Pm6VyntG3V9N+7rmL+jr+jr0Zg3l3jr28nrs1dPpk+V0+t56c5P6fD2dful0Ov3yibwvJIhvgfSdzH3gt6eptbcRAt5ufSC89V/GU+3wLdW7F1veE9rGtauv2ZR7eV+Ei9BLPlYV/txib4QRXau19Etcf95b+8kFcOFrqOsa6dDu+/5wie+ztbY3yXd3b+5Zu0vNA3VcQjqBNFi4ub/z1n54CZ2j3lp7VGtPsXfJENUDF2BmfbB+CdVUrlnroeNk9UO1nkjeWigcLkHhOEIahcDMHCiS8LNiMplMZgCZTCYTs9ePZnWrdcnQsUXYiPqUfikl9057XNtLqZuZNdKcpDCAEUCIlgtJIRiQYiWtAKWaLb2r8WrJ4BFeI3ispbwOzzo7H/clPDQexcrD+F6l8nr46wgfr5ZU7GXoSI/QceyHyukUHvsZRnogCf3iiVz4O+9+SPjW6Btfk148uw/7/thDwzmDRmvtHHpJ7d1jPz11SWUI2a/CSn6NH9efM3jsRxC5eO5H7ePrti33X8Z97Xz+x87uL/6B4PENfh7NIzRc3J+3DEZSa+5N6ZLaePNW0OeBCPeshZABqR3SxYcyHAEeEgYkZVbHgD5D4TXFcSZIV67Db8NvCdzw+gdP7m5Gl4BS4K29cvxsmEwmkxlAJpPJ5LPP/rmPtd4/ZQCpde0hJOpjvWddSgaQ2kopF9IaDizE5Oq8BkjIuocQGlmslAwf61LKbQ8eqdcZLEqodz3SM4AcYaPPfphZ+k0Ze7EOzzBy6Agj9yU7IeFrfl4Ekhrr8DdxT4aQz2P/F1eA36jnIX37uY9v/viV8CFae9suly8u2/bYMhR092172lP7nsr95/QeRs5dL+l7KAPI3jsgPYic2/F14+uHHlP75fK4n88/urT2xfbbByjpUAIecoQoZch52rPL0ud8wptClDS+tgfWROyfRnexh1Zef20CeBdSAUEazLp6V2S8hjhFFstAMv79kHUcYOgpgAJMKfci/GyZTCaTGUAmk8lkXe/fmd1eyKUdnY/T6IZc0nv3YyNLyFqfPdAIHeThEtLN3Q2AkRaqlVwWs1MGiNQSKrVmsMg3XKVehe5yqNwOv0/lXs3wYXZTzdbSNeZDaig9P6t3SF5FEDkCTPydYn0f4SM9P+t7C3kyAPp4EPmuuiLCt2f3bfvJZd8f9gwGGRgul6ctfASF3N+O+mEL5V5e37taaDu6Ho+57tce9rz/Ksi0WMe9uZcdl4fQF1vvfvBKAw6RMHJIJJ0ACjlC50XS8y41B7yfFZKuXkMAekilAkrA4bJjH3Afr8zdlXUod5WQkhlhNh4FZMh6+FhgtnQvir3wGwK3Ri4jwIhEiG5mXmttEoSfHZPJZDIDyGQymdT6/FTr6bnWeimlhI5HsoZyTdqeMuMm0aUxAO2QxEPeXRZWgGJkLWa1lLKWI4Qch+wdXYzbDA/WD9qzvk5PXQ+hk0xfS8g+EEZK/9yawaZ/Tvjd8HLMjny+ksYeQkIYGkAfXQ1EJB9F37L7MRCyC/Hy8psvl8tXETDebefzl+mhhxa+h++5PgJG6iH0Luutq/XAMe4ZoSPrlsrP6fdE/Ta+5suttZ9sfag9xV6zC7lOHaR7d4BEMK673F926dxI9KF4D1c4NGZAgEKJBhjfO0GfQNPxObuk4+tHR+Trj2QNJ8ws3EgWpsZjWeRCcu1fS5FNkjkC6dkl4PXr/7PjZ8dkMpnMADKZTCavX/+L3kWXIIfRz2bZ8Viy87GZLRezo/uRIrkDtkveQnBXlyuUTvdGAP0VqsUCppNLPULI0oNIBolx3sUplQHConNRDt1ZVxlaltRt3ltDNr7ObA1Pjc/Lz0qt1k8Vj7CTn/3pYnZXSCMJDgAISDtW5O/8lbvJ7/xaw77/6HI+//C8bV9EAPkqAskXl/DLy8vbrWt/fn67n89vM5yEv9vTu7YjlIxwMgLJu3aEl7d9P/2r0E/iM/7yGbjoKmj0OqWuUTveCyqpUSMFNOUsiPu2A/JQk5qTI+xZGLsDEikhJB5hNrVLat5Py/dQuEsakkaI7J/b01JhKaV3RyoPLQqBtFATAJkhfAuZJOj5GQ0/OyaTyWS+hncymUy+//3v6z/zn/kP3kr7a4C3ZlhJhnACsLp7dW8l1Vr6nuuQ2NqewuFb1gYwZAxKKK2YVQDHcPDxmMwJ6REUQjcpi9oiZIRus06xlDFcPA6hq7lGeqrW/MwSMhwQpHpE8HEOhqcHCIf7cwMkctwPJn099jB2ruA3mhAR9M27Jnrv65rcn7y13Y+Ql9rCWnju7f3tVRcdw+V57aI+YB46/Fi/hD+3VGtPGUaifhtBJMNNhpy//CI9NsD1oT8TCR7yUXcpHUN9bdf3AxaUPgekdOYmCRzXaYBG2Otu4SV0dLpKues6sdZT99xfSBYCRP8Mpbvv6n//5r5dpO3J/eXR/asH8ssHM52Pc0D0vCwlhBegPtzd/eDlr/vrsONnx2QymcwAMplMJv+Z/8x/kqW0N5LfZQABeAK0kr5m4JBabW0rUVtrew2PutUQYh3auO8bY20Ai1lheCoBeQSIw5fQOEzulOHj+pfMMtZm5UqWjvyMoVIq+lkQJA3kCB2ePs7CCF3SIe0unf2Yd9jVIwYTdNgZ+yOgdDD2AuKbw2/+uNZ4lClDQ+rc3HeEu/uGfU+/9BBy1Pv+4qPetmePdew9enY7wrPzEfoyH7cK/9H5cvnNy77/+AI8O3kdNsT0UQPCIRDBuD70XvAA6SKFEIFdZsVGqjv22T+TMGtKHx0XiQDUQ8jSD+DPR+juxr8PC++BtIIsRHJ14GH/OWX42qM+u2/PrT0/SF++I794rNXPGUCWhU+lMOryvK4/eohu0ON/9b8Kx88Rk8lkUvFzzmQymbx588fePTz83Y9m9QxoI+1i5pd99xezcgKYWgEtki7S6Izs1uWtbXBvbsaW10gTAkkENAaGw0p3G8/vs5QSqhihIq9JDCmFDkPK+wN0F+AiQck4Pv9AeQ+u7z8O91sNOIdcAVJjliGlMAWAPhQedOwR4/r7YYIE37/9GklXNfSB/R6gHtvRDflJy9cVXy53xexktd6Gr30+phAAo6A71IPXCF2hDDA5bP4U/tykp3aErxZKBBIjGITEkEYoubpn0APGNQ4J/PrP4tL6fw/rcyNOmh3f23DskRLUP5PSrgyI5KmF9/NPNoXCL5Ji23czKw7Y1du1oEMEad2Jw6uAAqmJpEsIN4/80Wv8rJlMJpMZQCaTyYSkPz7+I1+Y6RcBnM32s3u5ZBABGM5wnCUs4RfJL+5taW1nuLe2Udogyd1pZnSABYAA9xABGcB0kEipZ4MUzIBScqEQenghQ9CxCjFBCnj/l3c/KjmkxBX08EGaYbyu1SQjwBE4rnx8LQzjijSuK5yhjzx2xRFkru7hVchQ14AgRQkK+tdBgHCF3FuTXhyoNCu8XBYzI4BqvZtkgHEMaUubS7tSQNaX8CbpuJ6Mx6pGYAKUkBxJRBiM6zjo9zg6xIgReD94XdoRCk8ErEgNJPy42wC4gAKyXf033NG7VM09PbW5tI3DGEMLx6t4JYy/1/ARKAWYk+YSZeZO0gF3syKAUZV2Oi3tj/0xNPzsmUwmkxlAJpPJ5O7u5d3TU3lorb5pTRupF3K/IesLwLWHj7OkeoSQtro3hsrx/P0GCc2McDeQCMgQSJrZAqAZqXBHuIYfew3S7mYECQIlRJGABOog64BKZ5pcfhzAna7xCzig/j3QXTDL2tUDDK9Cw/jcdAJK0kcgISleh5LU+DoG49pVsOnf25F2rMf3vco2GGEnEXHFdc4CNkibAy/uPoIP0BqIDqkPPebFFOlfu3bVrWH/Wn79+0LH2kd9HVIUGmHGcxl+HUJ2oDIAYAXwq5xSQk3SCE9HAJIukJ69taecXym1XjJ4KJSufV8aABshFFAK7k2ttawTH4nUrEIqAhpISjKZWZMA99X7H8Txs2UymUxmAJlMJhPyH//48vKPvt339plZO0vlhcQZUNQMxxqqABd3hfx8zIJsCGcIEgLCjCYJDCQG0NEhWQQ0AnuoZg1yd7IxBWze7w88RORagkJQAAxP85QDu/op3+HH0DkgAONMCe8hZw93lGLENRDHJ7trhIQEqWQEktR1l+RY4ypkJNbnIozAwhFWEmnrH7sDaOkf6DpIXw8iUK95fQ/5tbBCDODqmx1dFx+4X0KHvK7HPeJ1SBku6b01+mqXdHGyFoAYjFoykq6+d/U2rLNa+2pr7fMatfdHsELn3cyKtIu0q7CnPsC/ueR+rFNwaW8knVS4udnmwA6zdZeeMcPH7yKTyWQOoU8mk8l/+j/9H65Ae23mJwkhlQwZ+36prV0s3X0rWW/bxcKj3kMbo4a7q3cREgUIOXns9/mPEBUuM46TrcMZQoqpIxQ4pKZQ+N6HyRvCFXJpy+Dh7lsofWvSBbHv4d5a6rm5v4Q/hh/qh9lxKLAAvWR4rwkeoP9Z2dXXyWJmt1ZKHnr4ZlmWz9davxf6bF3XXz6t6y/ehMJTn8V+Xv8kr59ytqOUVwu52sgEZPtQYAB5KLg+o8PGerjZ6Cbo/eHy66DDUff9wdVg+Pi68TVZQyGYgf2+EUaG8PV1E7kYUPpO88NdV+eyGOB9P/F+313+XEMrzaqRhQrcffy7QGubjg7cjuO/97a5X16ifnJ/eid9+Zb8yUMp/lJKCSFkL2Zvn25vXz28fv2Dl+9/H78bTCaTyeyATCaTyatXf+K3Hh7+4V9srX1CtjPJF9JOAJ7DF4CrxPQKqLq3RWpF8tDOcLpLZkLukeYA6W5GWjokc4nsQl5zB/vX9M9oIIsBBglDCuDuSgAFrUme3mcFLnK/xOLcWnvxUNS59+LARdKLl0IAhbhCEnsFUld7krsUTh0gxQCwUIXZq8XsZMDSD0xcClBJLnaErUKAAfje/2Pfw9PFjz/rcx4s2Fr7MjafXDp7DwQ4HMPZ6+6u64CRIoXBe/MbuRLezxxUAH4giPDrHZjrgZz0a4T3keTS88WsQEIBSggiKwEnKZN2pAM+Hq3zo/Pxo/O2fcrjdPwbbluV+2al3IgsNDOi0//d9DeC7aHxb+LcgCaJ/QR0NrMaXtq+//WNhPC7x2QymcwAMplMJmblJ1L5hdbsXrITaS9mVgEuJBcAq6QaKoAXKdXWcHPfSQqSGlk0XscLmLUmmaHsO8fJ2eyND3dXac0F7EU6yWwTUF0yHlGDAojWHJI8EODd99Z/2cyw0QeWzz18PIc/7tK5SS+N3GVWP/wWpw7p18PpY/YjobuQ9REwbovZqyhOJddmN6UHECOrAQbSmFydL9JRqsebXfueQeSl1hy/aZ8ueUL5vv/wcpzTMf4gPgJIDwaHhwJdh4S0dOIKaXwOxlq4gkRf+/VsiIZ9IHAowEe4DjnKEEjuRt7aCGPHz0gE3MiW1x1onrXUAOzIN4Bt24+3Zfle3bYTEbR2Uq1OgDq6ItYjkgd7hroxtL5Llx3YdrMq8uJk6/8uzd2L43efyWQymY9gTSaTyV/5V/76ed+/+B7AG2BfW9tt38fjVlt6Dc+a+34290toL7EP900JiUAOeF+PX9w965R3H8PHgTOU3jshO/p8iULI79ffhKT0fvZFqrWWfm69mxDKOq8/7rnur7RtZpuTtPGI1SHLrXCAZK+J9NwZ+4PjFbhvltBqdh9+W0p5HX6/9FfkFjLvuck6dFNLOVnW4aV7f6xosVwvS+6lVstrKfLGJAHI4NRAYigYA/XX0vWaV3uJrr5WCPqaSOAhja7HdYC4/j7B4eO+KyXEAOrO/hNcM3zUUm4ysFWzpZBL+FrDS6wrUOy4lxiQzSX3DC5mGfQKAae7w32H5Ghtj7qhD6rvx+NX25N0ftj3t2/Jp0fy+XlZ2nOtfC6lvpRyCa3vbm9/8Pjrv44dv3tMJpPJDCCTyWTyq7/6q2rt3QLolbSv7m4RNEprqa26b8X9Entb7lu6tOeMiMU1SI6ruQGQPoKHH3VTuKcD3q8LoR48jiF194aoM2xk+EjXCDnjxG/p0oPISztCx/Bnz8CR8x9S+rsdeHEGZobuRo7wwXR073tA+gG6Z6D4ZC3lVeiumt3VqGvWPXCkW4SSpZRTDZWoS62nmuEkrtUMGbHugWNJ0axaiFEbWXLd91YCDdKLk00kkDIbHRDxA+FgrIVO3xOy5KH3Q0cK73/Z6La8B9/bkT40yM6QEbgrGdDMbtZSbjN0LOS6HOGjLqHSoyABY/oBBOwINaCCPPXOEig53Bvdd4YjvP/7eNnCz9L+1NrzO+D5kbw8mT0/1rpHCLEIIPvLsuQhhL/5IL19+ot/EQ2/e0wmk8l8BGsymUxIKvhLz8//wC+ZLfdm56UUPptZJbl0VTPkOqQKeKwZeJUaACWFlAAy5MB4xr95axvIcyg7Kq0CG4A7ui8sZWVrhWSlZCHiEOCuVMeD1tL7QPruvrX+CFYoh88fUj18AH2YPCuQuIIIKKEHoRQJONyN4x6z10vqeNTqrpAZOm4NqDRbjaxMAYUZIIARbgoOEWbouEjJfRfQ/AhZ55aBZNvy80qIvUu0qbUfXt6by2Co0/evMFO/AoU4AgUgHLDvC4OrmvgoCvpndUYtXR/IaEbeV7P7NYPbodNSyrIALCHrP+twQ65Jc8l4dVZIhi+19qN92+43s7UAILkTMJktHh6U/jhbC+2N9E06h8tJCy0KeQY5s+rk0+5+45cLhMlkMpkBZDKZTH5P0MxOX5idX5NcgbUAtpC2pA+ZsWQwMUOI6XDfEfTw4UYagZRLMj/WG1q7ANgL2QicKG1OrswQkg4UIwvdqR5C2EOI3JsOWh843vbwDB/5yFV4ho+nlJO7lwL0TkfSwwTSvzYn4a7c7dGJZiZIBeRtJV8t4cXsxszuLZ08hZbQmk6yECjpBoxuyggfDE8hJcAdYVL+GS/uvrC14zMCAErR/UXSlxtwQaDR5RiYXaeHr5+0Tn5kXqNfHvWHZ0Ku0dj7WgjBVUkmt+UIH6dqdipkdoeW2FtMskLK+mf0Lk8RsBvA0Aghnnvu/uD7/qXM3gAwkWuoyL0xUGsGyUWiAW0n2y5lmFOTFpndidw8ZWbNfWm1Xtqf+lNwTCaTyQwgk8lk8nulC/IP/sD99JnZ+caslq6llLIeYtS1HgGkRG0X91rczyT3RgKk/AgSImA0A6+GqSHtaq2ZtMn97GQhsJjZSVF71L0DYnSHktbcpRaSZ+jIsyGOgeN9c79Efd6kpwZsKgXXr9ZNwAMkw686AeGkJASG4AgDSyXvqtnJUqXchd8W8gggZqsBp971KDxkIXayshFCxAMHZEesaiYtaq000kgiJAAe2iV9b2ntTXH/0QZohAOGrmrh20KO7gi+cfgYfDh8DKplYBvhI3wxqwVYQtUSACVEQJYlOd5UZR7O45q7dHL3pzwXxFt764AVs11kDaWXHoi8kdxJ34HLbpZubrYIWJ08tVIum9neyNrW9ZMGwDGZTCYzgEwmk8nvFf7ks9lf/pJ8eFWK1VKqkaxmtoSvI4zUAKiXUJWWJeW+gWzNjIV0B9SDhxEBiXAaAunskgdmgAmoTlaGl3C5kxLDAQnhLbT7EUX20NbSj/V5By47KZRiAGx0PDAgeeWjFN3Vh77FY8/sqIuRN32w/FTMbs3sJny13DM7MevwvIdkoWQ2DlFMNzMGOIRcK7yHD1dKKk5SoR4Mmkk7pc3cz7Ysny2XS3ZBNl0HAHS7Qt15vTXOah+Q4uEf/Ax+IHyQhPDbQhzdoOth85peDk+VAiAclGSAh1NkLncHsgSkJmDzI5y49v0rB6qkBvI4mB8oGGmNRDNDK8UaucjMnMzrm8iXrEPezB63df2nXMi/XphMJpMZQCaTyeT3BiRd+nv+0fP57hPyXMlazOyZvJ6grmuoupdzroFlA25qazJAIOHXv+iaNWUJsKuERGmHK3CINACpIsnQw8d4/CrwUJPHAhDcW2gT0ECOAXgoRLOP/TJNSiCp9BE+CCAcTNIBBmb9TU3hqVJ6DkuVHj6slJt0xh6BMr4+hYCBSPDaAYn0fnJ7gbuBhEjZETy2HFin+40tyy+srX21t/ablx4Y9PHwkYygpwDJVQgRx73DPo5EfvzGr2+vRt4tZmsFFiNrCV15yZoACyAjx8/eHKAAmOTjdccOLBXYJVmoWWvPOO5zje5HD5pulveXDB8gi0gLuZdy08xOoRJ6amTdHx7+Vxt+TplMJhPD71Mmk8mE/Mc/r2v9zWUpL7WeLqWsl1rLcyn1fGiJ/eWSKiVVs95rXVFKYQhmFqJCPYSEMUWELE1yyB2gCDik1GbuF0tJZ6SAC8OZIveUpcycZgiVqJdqVo0kOnpvLoKSQm6teUkBslA4QqwSUhVgIWsBzMJzXcliZqlajjdaraXWUwm3Zbmxdb0ry3JXD7+13Ks1dVNCjHutO/Na3FPCM7iEKkqpjM9iKakMOZVH3ru1Uj6NjTsjoREwUhhg1MM17huAFDr8BuEDJD4OhGvIhWYZPm5G2BgqpBmQXmuuzY5QAqSXVO1dr1TWlVyWdOCUdZUsapn7TmCnlPJ0BE6ykatSZkvU1cP3WPux9uae/z6/2v/YH4NjMplMZgCZTCaT33vc3PzJv7wsr35ca30Onc3s2WzJEPKS61B6ho/UfgSR1cNpQSnGlBlDxcBYkOFWAFE6BMggUMhrMPSMch0OALceXswMIfbPthIKaLG2EjBAIDmldKX661vduih5cVcPHSqAUgagpNxhPZSQrOOX6ZJuVmvIemCwIzAssV5yzfDYy3WNdSrrlaHwU4rja9PNCsfQvlmqcAxl9zNC+gnrCBfxYfiRmY1Ao+4j/R+HTEHfNHwADC2FXAtQbHSPQjyuGQMLt/7zs6OrlkHjOngMlSqVsV6iDlmVUELpBYABChFkyZDhpaxKD7UUsGS9kadY15wDOZdyv/8enf+YTCaTGUAmk8mE5F5KfUeuETTW7QgY5Tn8JWW2ns2yC1IuZjXqkiFkJws7RlrhOPEPMMAK+i+QUg8DkimE0LEPc4f1MJDiAcwsa+NBL4Bepx/RRIIhgUNqaK1Za27u6Xu4F8lNUgldOQsASihdBlhJkalSSYYfoYq0oHQZQziCV0lH7IcsBfJYH4Gk5BqDMa8iNbir7xUA7JeXAhh+e6QP7JEEU1dB5KMCpHBe66PhY9wNCzFJH7EnvVNoZjj8eIxtHEQ4zgQ5AkoxoGRtUqlSBpClAqzujDXLIRhgPIJHBo7VQ62UdT/W2e0Y4aNspeBi9hJ7tzsJx2QymcwAMplMJr83ub39M/9IrfdvgZt8FGvLDkitS4aQl2VZsguSQSRDyLmUGtfLJbxZFOQRPCBUaUhFkLmrtCMEFGgED5o8BPThZKUMkA0HaEcQSQdIkSYLH/u9+WL9M9W7HM1SI3wc+6jura891hqKNUMqAEOWXrMmYWQygpEshCEzsBSGpwyjJpGi5HJvKWQtHbX7jqv5Fl3NcSCkdNIMX0dd3wjyWh/aEz5yACHxUTgCyNUawgBMBWYpwKyUaimypAgwvYc9di91SGIIQwVI0UhzsrRQBo8tO3Fmayh9CeX+7UauO3DaluWvv2AymUzmEPpkMpn83uZ0+vQn2/bVvXRa1vVULpdLhpCTlIPoy+K+RV0Ws/KSDpSLu1fJKyAwcPkIBITC0UwiIaEPpJvopGAAbcxqAIaE9FxnleJ4dItkGW9ROq5AWbubQe6QKISUGo91WSXbeBuXpUgzBce6kAT7nyNVjn3RXWbmlMa3TNKdZAPAkEAyBEip8b8jL8D7I2Fhm9wvrbXNQ5JcgEY4ccAVgrS5dHZA6Oi373wk4sfvAUhcIXycEUIMCr5+r/c9XdUDEIGkq+DDBKT6ZTOJkEyAsc+MKKDkfuwJktO9IXAz7YDtJDczu5C2kTW7dCHsZthq9TPpO+Db7e3T5fPPccFkMpnMADKZTCa/17sgf+yHLy9fvXF/Ou37upZSXtyX51DUy+q+3kj7KrUzUFagLoBifyuAmzsIhSD04IBAkIWRgNNdANEhJNDlgESzcV9KBrj3QFBCIJlKGgAHFDi6yyUbgWWEkBRpRWK4KDlJA1AMADvm7mamIrmN8CE5+6NdJBtIB9BCRoACnFI6eujwMRCfwF0uNYXCN7WWeW1rIZd2uad2HOEkr5/d/d0OPDcAwjdGBKjDFc7ug9IPfiSAkx3rccI7g0rpqZG3JjWQYTrD/aUBLvdHBy5dGgGnewrd3UM6cLhLZGskFfD9Ts+IKBJMMuR6hDd3J9kEEBkwSJwBZvg4m9mLWQYQ28wYsi3qPTsgy/LufHf3z3ok/74dP8dMJpNJwWQymfwB4Pvf/77/2q/9295dLvi0tUsF9uq+G+AlvALNpBaOKslyH5BJWiQvgohQOuTEgYWoENRrySSk090NcAICYCKRQHIF6akx35AQuP4cZx80t/ACoGbdVSSUo1bfw9CYQwhZUI2s4/W76APliH32+Q4CTABIIYZANpcaRtBIue8pSRdl2DjCxeb9MMa+vnjW+/7U9v2xbdvDfrn84Lxtf+ksvTS8B5ksdmgt6f2gxBoqqX42RwEq+300+3QlP6ml/OJayi/f1PpLp1p/JfwX12X5POrP11o/W9b1V06xTsX+93Kv5n6tnyzxGdXslZF3BRhjPgyK5ToJT1mKZAoHCjCCmLu39BRCHmpAU7+P4TicPYrapZT1qZQaWp6jfqz1FFofSynh9m5Z1lB5V+vbr25u/qGvnp7+d1/9V/+rcPw8MJlMJrMDMplMJv+cy7L87V/V+ngD3K77/lLN1tOynFZpW1tbwttqZtW9noC2ALZJLPJmkgA40gDxcGIsAUrpCAN9hItcmEFACSlwkKDczeVIzIwkXFKTaJJ7KJceUNIYaock6irwkDSAV4PalvsEUqB7A7nJbG/ABmlnyKSLWisGULVCR1iqIKtIS0GCUoB7Fp6m6/NM9lRzz886p3v6vj9f6W0EkH/wWXrYSRAgDq1GLgaMOYpqgL33y39ymOQCpN7lILCGrxZChpMjlKQKj8+zMQSfwAwdCXC5Z1DavLWXqJ/2DEvuz4g9Sg4glr430pImmUmkO0aAUIiSB41AA+AMKfeAnjThoUQ41o0SN4BnMmWX0LNZPR9iziK9HB2Q9WLWXmp9fCnl1bt4/e6GyWQymR2QyWQy+bnpguA/+Z/8924A7qSn1d0rsFHy6t4KoCK1cuw7cz9kSkcrkFNwCCKkvM6ePPpaBNAlheAB4CKhHhKQ6wAjoBA0JiBBcHRPpGbhofFnUgGQe+W41sKzhoVb77RwCDQyPHDSfJysDVAAlN6/q3J5NbfRtbdQ73TsynXUsb54at/Tz621lxZhzsM9PENH+MO+be/21h7a5fKjSx5ASILAWsjbYna/mN2tUS/pZrdrej+HI3RajtPIU2toKcf+fehNLeXNUsqr0OsSCr+vcS32b8JvSv+69NBi4aHVhpeSuimh8JPlfq7TyRqiSR4mkFQIEolrIJDSETRal6cLGL6nq4cnAOloZjXPoHkIf4wAnF2Pp1pvHrIDUkrtHZAluh/1q2Vp7+7ufvKj1v7XX/7Fv4iGyWQymQFkMplMfn74tV/7b27b9huLtN+01ipwtqhDrUgKee0eUpdbrl3NRmfhcCB8BBJIfjUH4Ln2EAB3EokDSnJFMkWjVSOOLQEm5cJH+OiBQwVSXiu514OSHaHJGRJII8YZFmkFhLUjeIx5jhQcyHUuiPfChwPNpd17d8OlDCCpC47Hq1LnHj7OewYO95esQ0+enYTQHnWLwf8IIj84S7uAU4aPeoSM29BNDx83oVMl19BSS8mwkaqFHMr1Tei+ZNgo5S6UdYaQuxE6UlZK+k2qh4zbeoSMm1rrcX2ce3J0TBbLNblk3TsxlQCKtDvg12eRKDWCRyjwlAPu4b270tIdaMrPkDS+1s3sJfTObInAsUTYWJ4ihLw7HsFaIojUWJe4tn61rmvcd/7y/v7v+tEf/sN/xwMmk8lkBpDJZDL5+euC/DV/zb/k+Xz+7Mb9+bTvrRwBRBUYr7dFlbSEExghBEcXQs4eQpAOCpAgeEhZC0h5k5Su67dGpUgigUAwMQIcj1Sl6N4Q6rMebnKZ92DUWu6nUI77HYJIGEEDQSctpUPszxNJ7i4AjgTKktIIH/uQH8EjfUNrWw8dwy+ttdS5P770kh2QDB97KOrnNsLHvv94c3/nGSwydIQqebtmXcppIdfeqTgCRylLJWsq9/p6ydCQgSP27uwIFHdZ1xE0zDJU3FyFj9s8uT3DR+gUda7Tj3tKWdKNrD2I1HQCxcZZH4GO8Hlx0oWDdB9hAvCu1qTmvePRcq8P5Ie2fs2dRIaP7HI89NmP7H68q/X0EP5olgGk5F50Ppa3y2LvTqcvfyz91370F/4CGiaTyWQGkMlkMvl5DCH/K/8v/hf/w7bvDzfubQFkUiPAEt6H0JGeKqEl1MOIV8BH50NAuoflykUocAcgQCnvjsPHfnIsJY0QAHen1MIbQybJ3FU1ujC+p4cUar37IYwD2AE6YCN8tDFXEnIA3tdXr5Udl/f332rV3M/eB8zDL2Mvg4cf1zJ45Pr5KnQ87vFzDf/xZdt+uLl/5YAV8qaanXoIOS2pfohfKvbrVb1Y1v161GsGjgwTGSx6fVeP9ehyHCEk1D2//gga45Gr9KPbsfAIKrXvV4SuDhokAiGB0/0C6dIAKTVmUUiHlLiPofNUDyHq4cNj3Q75ZoZHsxpho4Zn+FgyfISyE5KPYVnoJoJHfbeu9avTaf3y7u6HP/yVX/k/v8NkMpnMADKZTCY/v/xVf9V/+/nl5bdu3bcV2GprfdZDCKm6e031R7Ou5i1UAecROkbOwOh0JE5ihI6s1dc4cEcgCf1rmMus5U6hwd1HKLERNsZMyHgjVp8LIYCUSLT3wocDcpc3QTsAH4FkhCHlNpr6nEdL9Ues2uh4xDp0TrXuY84jlYGjv+nq7X7oi9APL/v+w01614AlQ0dorX22Yy1lrWS1MdvxXvjodbVQej1CxY31sJHBo4RbeO6VMcNxhIrUaqHSTyrvXq0HDo4QEuusWUqxrAP0blQPhikPNri/+HgcCxB6CHXSHUiNELKnt/AGbP3VxHvWF9IfzexdKan6mPMey3Lzblmy+7E+hZ7XNcOI5d7b0+n0dl0R4eM/8lvRuBMmk8lkBpDJZDL5eR9I//ddSjnftbYvxyC605316hW3pYcQAsr9cJikrHuY2BvpTlJDpEanw9MTJFCvhRSJXI15kXAxN7oMgB2uPvPRch1y5hoAj4CjBtDJQwBaKFwNRGPWGNfHx7uA3d1H0Nh8DJS75zD5CB0vvcORyg7HQ/i7LQfMj/mOL7fLJbsdPzzv+0+2nPdo7R87Sw+NvF/I29o7E1GvywgFI3wcGkFjeLFQSSdzbx1D4uxhJL13Pg6vdXRAFo7wkYGDTJWsU0wvJX2si4VIGgCO8MFQ0CC5+uC9pKddAZBK3EManSNgbz2EdOV6a8C+k+3JTBE88M6M2fl4OAbM1wwjz4cswkd5l/u1enQ/nn/0J/7Ev+/v/30SPiaTyWS+hncymUx+4Rf+OS9ffPHXf1GK35hhXRZUgE/ufioFq/u+uLfQZlIrpSwGuEklnHEdDiiFgIAZKUpAuAGk5OEo4QoLZ657+HCTIICprB0aJwGOAwvRQwnSQ43u47ErOUEHU2qCGtAa5G0cnpe1egA5dkTSDTC2RpBg1uE63BBSCiAAhY/AIrmP4fRzFDnz8eXlONRvE3AJeSg5FWAEgFr7ILl1L8de6eGgGEALCBjTDgiyhGrXwh4wQK7sa8Q6dOqD42EgJHIM45MMAWamw0dIFEh3oPU5HOwIJEdrO0rZuO8XmN1t5APc5eTG/rOVVGx0TA4cI5AcvuOYH2kvoQdyC/mT2W2Ij6F3gMc1fzHzWOsh/B15js4HY/D8xz/EZDKZzAAymUwmv38g6ZJ+C/h/vgHa7fmMVdKLO5+AVt1PS5/5KIBqShqD4Ushm4DWQunoYSPpQ+UKRwlXX4tkAeASjJTSc4k00FwJCSjxcOsNDYHg8ZEkAJHmtNKMVTQTQCfQyFRRyAE2oKX3z3OTzMcv+hKCq6l4Qgik9CxdUmrvBxFuTbqEnvdDZ8cACjG0WA6Ik2vpIYNAuoUfIlO5ZwZYv0amj4AGMNxChaHrmmYVpSwkTxlAmN0RcrVx7kcXpNElIlJmSNexJwGN7puTCFRDTdpR6w1aO6uUW5RyhtkrkY/N/dFJkWwONJFGdEZX6QggLV3kpYePy0MpL49meA5/SJGPz2b3cf3pmfwk17GPt/n4Va346vHxzzxgMplMZgCZTCaT31+QbG/f/v9+s9ZP7ve93Eh2qfXdM3CpxwnpXtxbLaVVqVkpGUrcABWgndx3hfsRLtSUxlzBABg5Ohy5VrquwocfnwNKnusSQog4YK4wAgdM4GJmRbTFi50QbsYK0GTjvIo0oWUZBuL6kaK9ISBBd8PXcfSgovEK2VD41g7l119yT4CQdO8YyRsDjvDRg0C/SUMYAATJdI6607/OcNWVGUEEpZQ+v3EcPkguVusJZKVk1kNUAhLsKASz9NyXS7tyvzU3swap4uiwXEiuOL7HbegO5J3IfZMEBYAD2HrAy709/OLuzxvQQNpm5g9Hd+P8WKs/lsJwhD9mEHk2e3oq5U3U58d1zdmP8u7m5rO3r16dfviLv/j9CyaTyWTOgEwmk8nvP/7qv/q/e3Z/dyO1WwkLsFt4aLd+KGGRUAAZ4ASQe2Eq0tY7GIKC3Bwi5emHPEQAho4ADe9KlNL4GsmdtNCJ5L3MXrGUN6j1DUqq5Ppetb5CqtRXrLlX72P/DrXcwsqNjBVM0Qg0d7806ZJy4AgXsbdLL1E/7+4voafLUT9usR+6CDg74BgowAAEuRh5KuEFWAwoPYgUOwJEHZ2Q5PrUcxz76RjoCCAFZjW0pHiojgBCcuyN/ZKCGQOL2vq6sJQaKunj9Plxfksf/m/hG3tYo/uOLsZ+eANAA4wSR0gMPHTM0QBPO3k517q9LWV7Z7ZF6Mj5D4XzIZQewWN9XhaP4NFC/nA6rQ+3t5+8e/Xqj/z4l3/5f/6AyWQy+f0cQCaTyWSeDfJve3l5Ob1x1wps1X2npHKEER+zHEt6iIDKUe8V2BwQBlmTSMLlue7D5g4Qh5QOEsKgpxqSKQfMj1mHOzN7DfKeZvc8gkaoRF3uVOsdar2P9S1LOWXgiP3b2L9FXGOpNyyxNquhRYCFvLk/N+nhLD1tR/28Sec91qGX0NlTwB5yhISONALUNUZyMaAWYCFZjAFgI3QUspA0654iAL53IrsDrsCPry5+hKeiqEcgSY2apRzrUgp40H++Q5YmMyZIBwSphTa6N0XNHj5yjVD4PvbS+2NaxQCz0Zk6nDjUGolLKYjAkZ2PDB14yPCxLCnmQYMRTsrTsrTQzdPpdPt4OpV36/r5w/39J1/8kT/yP/8y/klOJpPJ7+8AMplMJjOE/Pf273//P2/btr+WvPbgEUI5gojSUxVwHHstHJQuWWuEjwE5FoKEkK4fO1K4rmYdwtX3TWQNnWD2yjJ0ZAjJwFHKa6v1Na3cMkNGKTcMwWxFKaeum9CqUhaGo9ixb3ayQ5XhBIqkzaWHBrx41sAmoIUch4RrpLEhfJjR5SgGlOvHqEiWEUZA0gB2ECjwcE9c8h5CIIBOFgCmFDm6ImV0dXI/HQFJoEuAUiCVzpHzJB9Bg/01xGxtdD7aCBxwv+T1rK2H0uu5FaYkJCDpZvUl9FQKHs1adj5CHHqu1UKM4JFaogOyv1uW28ebm5uHN29ef/En/sT/5sczfEwmkxlAJpPJ5A8If+Vf+Reetu3lzr3dHmeDbABUSBTAKakPoDdKO/IasOsIKpvhPSSNKgATwAUohNSYf1Bf9lBSQrcjeNDsLmuW8ipDCM1uMlSkZ/gYwSNrlprrFXXspZcF/TA+Rk1ytfHIUtYSKZ0bsAuDDwePdALCx1GIoWP4/FCujUnv+nRPwSUX0JqU2j3dffdU1A5Q/XwTpB+BJDU6IhZuYmDG67d2hZykK0D6ERqHdobgnrpgHAAJ7EiPPWvt0u+5MGQkCKRGcCICkbab2bNZfczuRp5yXmt7W+v+sCzM2Y/nUvCyLIrggbhuz+tqce3m8f6+PZxOly/3/f/z1X/9vw7HZDKZzAAymUwmf2AexdKv/dq/83Hb6pvWVMmtuDcAqu6w8NAOae/dD2esDWjqb8uy9zognes9QUIgjRkPQAgXkELo3o7OR4aP+1Q5wsed9ZBhxW5Y620PHDfIumYdquU21iN8rLG/chy8R9b0Xlt4IVBDhcfBge2DweNjweTr97mk3Y/hbPIYRrfwhFedD/Vk1sJaDxqtpbvvPYgMRzuCGf3wMRuSog4fgW50PDA6HQoBaBzBw33PmmPGI70HkhTcm7lvaO2CcIbTPbURUHL1g5CT3MzKY4aPI3ikMzobeKi1Rb1F6NBLreX5CB81wkd7t658Pp1OEVjaO/If/OIf/4/HhslkMpkBZDKZTP6ghZD/1v6rv/qfM/fL3b7vRsqkTUEFdoRMagznMcDt4Y4kfAkRfXXlDA+NXXV5f5tU64Pg6avMPinHsPm9hUo9BsppdmMRNI663ISfWOyUnoLZOkIHrERtR/g4hrWvh7RHZyIxhCiBrT1Jem4fCx+SPhpOpPF3xBDJtQC1Bw6gOwEpvIevlnJpH7oKIUN5jwTQQ+EImUj4UUsM0kMjeHiIWfeAiEONPSRRSm/sg+ehEUg2HKHjHN4VGud7dBzQTtpzKSVCxpLBI7sfD6XUt8cMyCXqp7jmcQ8idCi8PkX4eFjXNcJHPnqVj2D9o2//7J/FZT56NZlMZgCZTCaTP7CPYv360+Xy9lVr2+L+QukCYIN7M2DPWu47j7o5oBJCiIBbH1gfkLz+hR2GMAVAagynK2Ru9sYygJTyugeP+3J0Pm5DN+xutd7QLEPHanaED5R0G6+mrVkjg0fIzHKvhCyFPgSOYEQDtnZp7l/tgON9JBFfYwQP8MMD6auRQCpIpwLAU+O8DEkjhAztbcj9EtohuUaSABiSuiMUOEil6+pzD/WAkXvuWY9Ox6UHj/Oo09Fa6qzcD3nUea13a9wBZHExKxk+InisT6UsGT7epUrJEKLQS+w9PC7L9lxrdkYYHZCW4SMGz29i8LxF+PiNt3/mz+Bpho/JZDIDyGQymfwBfxTrP/2f/g+9kPstcCnAGdIROKSLokYf1CawhYTA+i/BdoQQlI/MhBAQSSgEUiF03bGUz5da34TuLTsgtd6F36SXcIZHPYbJTzw6HQvISrOCUmrW481Q7GuSxY4AUgHwaoCBkDwlace+Pzjw0kZgQIc8DF+HgPARhIAc1/1q+zp0eGis937Y4RZ+CZ2b+9MWIaDfqxYKd2EAD8nTx+XW9l7vzPDgvktK3xBKz2vhl6u9SypDh1KtvXgPIqEdgDcAG1leMniUUkf4iLCxRvhYQowAkjMfe+gpwkeGkHzblYfa4wgfNzft3en0G2//9J/GIyaTyWQGkMlkMpn82q/91zZg47Y9nqQRQlqKPYSMk84pbR5mgBMBCUiyHjSQHoI0ruUaqURHbSjls1rKp0t2PULs4aPUeht+Yqj0MBI6MVWOx6tQ6sJaFpqNeY+leyVpQYGZjbM2AggAJceYlQCEbfviIm0YA+nkCBgfCyD60B4SsnlIfcjcD20atbSHtgbs6Sl3f2nSpYVvxxkkqYeL+7vzvr+9AJQEIRh/5oMRPhqA1usNI2j0jkdfX3xc62vltVAPHukZPl5yndfG41YXs/ISytDRux7ru0Pl4Xjsyh7Doz7HjMdz+FN0PM4RRE4ROuwpgmX4/pDh40/+ydn5uGIymcwAMplMJvNskL/qr/qvPLt/tbbWVvczpJSMbGE7JAeQ63EKtrHvCRghJHU9/wEC6o7hIE+MALKYHY9cHeEjdcqwwfHY1aFbW5YjlMQ1hFij7gPn/bGrarUeASRVSiFpYIBBf6LJvfnoEAALjxDw2BAoOBxMw9dh9w8O3KeAJmCXNA49fEntwHNsblmHP3c9bV27+2Mo9y6e9wKPLbsSEglQI3S4H94HzP3Qhv538t7dwHtdED/80gNH6Hjcyt2fw59CLy32G6kLOYJHTb0L9Y5HeWdWH46uB96N2Y9leXlb6w/fLctzhI/LQ4aPZXkVgWV/+8kn/+iXf/yP43mGj8lkMgPIZDKZTN4PIfpr/pp//fO23dwAW5U2kK0HCwc5ugci2YQDkYICMwmQpa67HoBGDBAOSN7m7Ec1u80uR5/5WHuoOPbCcy+vZRhhKalcZ9C4fuxqQd8bp36PofPxiBIAV8D+qFNKec19w/G400sDNn08aCT64KNZJETqqnuScowgQm4OXLry+zy38K783pfwvKeJbAI8NMiA8BjK+wSpXQcLzzqEqNWFQ3u/flHWh59DL0rf9+x8PIeePLzF3i61sxkzeDwfnY2SitCRAWQJlYfcM2MEC4u13prt+earuOfL0I+jC7JHALHnWi9Pt7f13S/+4j//8Vd+5e94wWQymcwAMplMJpMPh5D/afsv/Bf+g3LHKp2L+wbJQzCyOanAAeR6dwVkHyxPAwWAkkIwICUkJJhkZbaGXi+ljJmPG4u9VKxPJdTDxjqc5GKkIdUfsWL4EEqpFsp9HOHDR/jw1jYd8xa7og5lCMm9La69tNbeZhhwdMgPhg/2a10aNVP4ACQ60sfvGcHlY/Mnu6RHlx72o0uxKQNJKuvW0i/eB8oV96Q899P3/Vn7/uShlnVrj9nxaMfjXi8XaT+TeDHL0GEPJB8zdITe5qzHEUIswsehqN+aIWpFvb1dlrdfLcvfF/oywkd9ir3oiPzi29Pp73v7R/7I33HGZDKZ/AGndv8Ik8lkMnn9+p/5k4eHv4nkmUATsIlsvFx2ATukGr6EblxqgTVpbaQcQAPkEm6zdPcKkJKIDgkBCncn0ck1QhwdhS7IjOk4Pj93QRzkPkMjHAhgAgWAA0gXAYxuyDiJHQcMFV6HAQnq9Xjdrq6vf/18EH08eFyHj28BCUm4Ypd7hqS3rbV/5Ey+MrPPllJeVbObQmZ4O5VUKWsBGJiFZ733n0GXQLKRCnEjSzMrZxLnUiy85tD5C1mezXg2s2cSIXs0wyOgJ5JPZttXtT68Bf6BCCpbhI+b51pfnpblj74D/vqnP/WnsGEymUwm3ySATCaTyeTVq3/mj3/0o/9bLeWRMVwM4By6xeVy1jGE3royeHh4JpGlAWgSHGBXW919HSerYwCHtCk8dH0wYQvJSRg5QsQeXhogksUYSMRBrzvSseO+hxrC0dqm9AEgSEoPmoBdX+9IDCR8DX2kHnzb8CGMe6TxgdcByIX3kB6yi3FxtwtZCBiAmqHkVMqnJ7JaqJDWjuuEWUXUbmY7WTegtKg3kpfws1m5lFLTQxbiS9YkM4j0ANKezPQEPEX4+M23Zn/Hu/An6fxU66vHu7vffPiTf/I3zyR2fBsmk8lkPoI1mUwmk7/2r/2Xbq19ytZ2I18gNSfHL+/NzVqTIDLXu5N0ADqUxtwTYGIAECELBdIRJu5rKSf2czsQsn6CuZHL1TkeDKVBQf98T6kLqT7X0XVJ+aH+1qn+yFLOPex7Pp70GP6TuPCTbQSR7yJ8kCnhm4SPa0hw6Fh7CB/R9azJ5sBFDKRd0tnd9wbssWgXM7yQyCDxZGaPqVLSx4xHeQw9HM5wS/3/2TtvIEmW4wxnZlX3zIqnBbXWpEdNC35QeI++b8CCDxMa8OkH1TMpXTjUZ0Jrre9uZ3ZEd1Vm8q/uirsl30FrIL+IP/4Utf7+Ud09t9B+7f0mpXrDXHc57+7n/NH7zO9H/fDAPB1yfnb//PMf2//czy0vmxt98wRBEEQACYIgiPdBXtU3v/nPz7UKq3oSqY9uKkRKDyRm/S3zZQ4MdRNmYhDWrU4QUw8iCQLCIhf9Nz6G/k7H+gJ5Sqn3TOvZNdTAobuf0lW4+qrqZvXOp2arqRa/Gz6gFjygY1Ot9Qb+hcl9V58UPpi/ufDB3NT3XxOnr0cPH1+ffssCWq1Q/5IVzynJMaV07D8i2OrbnNMBff+61VIvYaRpfbeDb5sz2y4l3THPD0WmG/zpw5w/80DkI7th+CTOz4fNpuwvLj7/YBjuHxE+ZgqCIAgigARBEHybIcRe//pXyna7c1UWoqOlRE7EDvo/v64oDd5DgrgIo05+J4xAmeCLBAfQJwjlwKsyA+qf0F1qCHPq73GYN/XgAVdavTYn9+JdZlYN8/6C9mSqM5nN/dbjqKXcQg/rNH38ZPb5qYebhj/hVgJyftL7H5jdVcfp28f8SXcwTw5JbJCK8CziU0p+FJH+CV2GpIWOW+xvUcPpAN/Dcc4PEGa+E1EEDtszN58ROE43IqeHyC37nO/f5PwhzD59i/lhHAl/k/CJ3Y/sfvZn6fzcc6QUBEEQfCcCSBAEQfDOd76qb3nLH0ylPEfMhVXP/caD0Fe4oXcTccO87zKtzpglSAy1w72fsd4L84A2Q0I42ybwBsHNiIwhR91DR0Vhj8IH1B+5Wrzfekz++DcuWn22VcdayqHWuq/z/IWp1k+ciJQ6X+uRKV73DlHXt3Kz8eQz7neHRq+F+8vz7MxURZqkpCTnlPiUM59Q98BhzQ+tb2EjZ9u3kIH5QUQPzM0L9jPmdc887VBD0475DD/CD/AHCB2fhX9oP45fQAg5Hofh8nBx8fTN5eXV7S//8v/sn3qKSvy+RxAEwXchgARBEMRNyLvtLW/5x9Pt7V+4yEzMJzhrfzTKmdWICMqYZ8zEmBPmGRKIVSS1M3BRzFpt2KNOtJ6RO49aCa04ZAahUOrveMCL9+DRRP//nQ/VCfW5+9RuPloI0X77Ad/XUj43uT98zaNXT7zN6PW3jz8hdDzpEBNkTcxSU+IqQpMIn9bQkc4583LTAe/BY6lPa/hQnKnw+QjHuQk+w8+3OZ/26PcpnXYih/0wHOA3tyJ77B4ibDzA7CsILJ9Bfz5uNnYYhoq/v0LvCCT/vvuFX/hEe9fDKQiCIPjuBZAgCIIIIURvf/u/Tg8f/oaO48bNXJjVRMTWG4pMqOGDMQvEzXsoafMEb70UEar9U7BwUhHW/jdO5NBCr/XOo1cVXg2CF2r14+BRen2GT97UfwsDOmF2VNUDdFvm+ctzrR89EdkTXzpH9S3gX3f/hNDhzE1uzNxvNmRKiZtOEIKE9FAhEJ+wR/igJXD0XeubQ4T98jeQnnJ2zCp8xtn2sviEkHJGuLhFmDhgtke4uMH8Bn7Abncax3bmeEhIKNvtjN01zo77y8s/Q/D4m2M8bhUEQRABJAiC4HsaQt71rnvz29/+7/s3vOFPRGTCdOMi3m88yNDDBbMRM9aURNFDCcomwr72UlEXZltE1GYEsRGZQk7krTZ3tDSbYdxfNu8vms/NsS/e+67JmvqP8qnq0ZpKaTcfN6XWz5/d9/Xb/eLVN7FXInIR6kGjhTAuKdESMPqvj6Pm49rLse9af0CN2bKHHt10TOtZX/523dMk0uZ+GgY5wnGW4Iog0Wbt7IxAYks9juWMPep6Wj0vIWUcx9P19fmG6Pn99fU9fN3qc6enn373t/C4VRAEQcD0HSEIgiBwp/S5z73yFNFTz9TKl7Wmi1Lsqtbh0t23tdaLWm2rOqPWrVmB9MLMNrWWDeqNuw5Qcvdslkbm663I9ZZ5Cw0D82YU2UJD7r9rAU/iLqgZTkJE3GRm5G5kpqirr5qslPWzu6qH9uL5rPrwXOuXT2Zne1L4cP+Wwof3hiFbQ5Q3V+alr0Stdu0zx17bTISaG3ZwsnW2nLXWr7W1eT9v6Nmg2s9gJqitdu8BR1GziaTa6jXwJGWudRjSTJQ1pTKnlDGf5py3qA/ncdxO4/jiaZrixwSDIAgigARBEPzghRD55CdfdzkML1+pPveU6vaqlOHKrCKM+IV72ZSimxZCoI2ZwXWL/Qa+hBCiklTrgF0mImg7ItRsRC6wG1EPLYCMLZBg3QIIzjAkiciTO4m7s7uyWVMh1FTryczm/hjWUWvdL49fmZ0rNENKZF8vfDi9Fu6BwXrYgMjaTMQr+ure6jZzRd/PubYzPYBoDyjW95i1niBedpj1swaxibS5Na+t5x44iJpzDyHaXeBaU2JtdUqKc1JzbnWdiRJ2c8l5QPAYZ+b2rsd2SunDsxlN+KRuZSajIAiC4AcxgARBEASf+cwbNyLvvfjc5/6dX3rpL39a9QJBRC9Vy1hK3ZqVTa3zBj5itnH3jarBl37AfECdzRS1JXcaiC6gqyWEMI+5BRGiPKwBJGV3xt4zJO4mZsZmM6TsPpPq3F9OPy03IGZnqGCm5k6YHyrOe/t7IlKI7/6mCVpd6hXU3nYKVVrwHhYI3uT9b8jgkKvIsu9/59Z3mNkyQw2nvmt921sPHKJrTdbr2m9DdHWGW2WWHkpqDxsCr817UMmo58L8OHQQjWUY9vMwbKfN5hOncaRy/z6VX/u1JXg4BUEQBD8MASQIgiBuQ77ylVe2pTz3tNlPPaN6eaVqF7UeNqWU5dbDbB5UJ6huVXVwr6NZCyBTVi2tTjg3NHe37M7wFjw2A1FuSkRDDx8Ml8WJVNxJ+g0Io6e1ngy9N+DmC+orRc2O1b06MzkBd0LtRivWA8gy631zvxM2mhv6pe771pt7P7/src//76NWqE2EdK0NO4G4rjVZv9VQzJaaSFWEjWi5ydB+vrnmrHCyVosUJWqzXJjPFaEDPtb2iNVmM86qL07PPHNveuEFmnqAcgqCIAh+GANIEARB8MlP0jiOr1y5/95zzC9cTdPhstbjRrVC88a9ZtXToHrOLZCY1VG1oJ5SDyOore0WJ3I4ZXeBKPXbD0GdUUMMjSN6zIzNjN1dILiSGTZkbqYY1dahd7ihbwHk3BbEbM28hw7vIaHNDTPMSWnB29wfhw9T96WHlt7WOcG93g0hPSDUfkbX89pvMKTVup4XeLWUpJ9Ze9QqIvDa59wDSWnzHkSW2w4dhlSIjmUc8yxyVbbbZ6ZhuDe3m45f/3UqFARBEPwoBZAgCILgwYM3XjP/9NPzvH2qFL90vx1rnTa1HuCnrFoG9wN8hqZ+61Fan1Bnd4VrhgYiR22Y0Z2bERP02I3oN5v+cnqbk6oxs4iZOWD3pUA7ORGhbFLMZnU/KVHB3JwAMy/71veQAZH10ECYNbfHe1G49VuSHgzMRETX3tAv57V5F2rtQYMNR6E2E3Onpe8voxtmUOk1m1nCfnr0ZbGcz5V5qJsNo9+i3pV2y0F0NQ/De6sqneOdjiAIgh+LABIEQRC4e9rt/uqK6Lmnp6lcu8/jPO/GWneb9bGreTQ7CUJJwi6hH6CMWlRtcK+JyDCnTKQ4Q8nMm2fvAcQ9od+OzBcjEUn/EhbkCT3DAbc5KrX1vQ+hVrtP1f2o7rMRGTGbPb75oD5ju/NuiPZQ4nC7+15HDxpPCBvaXCF/fJMhj24zzIr1oLG4+9zPST8zqxl7zqmKJPRn7JoPdRz3pXlKCbOrOef3VrM1cBARx+NVQRAEEUCCIAh+XINIvr199Vr1fHU6nTZmt4P7biyljO4TfMpmO3E/pVo1u1eoJFXPRIbak7tBjFltDpk0J+Jk1gLI1UiUpX8Ni5q7JyFSMhMmIsfMzc4OzF1gB1117jcc6o/DR3O1u49XYeY9UCxyV+91DxFqRK0W7KqlxOouvu54mfW69+VOGGn93PdJmTNmZ4h1sxnQj1VkV1rYMHtx2mzu1c2G6he+QOV3fof6I2JBEARBBJAgCILgbhBJNzevXog8SPP82fF8/tIW0+086+h+XB7JKoVa+IA4re+A1GzGPXSoQL027KX1QnQ5EF0P7tvMwKySmTKRwx1OPYSouxdTnYyZltr9IYa3SsBdTQTmRCIMZ1Taf0Bw7ZlVCTwOHhUuPZxI//vSQwi7SJvP6i79vCjzhDrVth+GDD/iXMJ8uc3AblfR15y3KjIW9/dOl5ekxyPpL/4i6Tf5OFUQBEEQASQIgiBwJ/nsZ18ZiL64cb+AdGN2gV7HeebRnbP7nM1yQg0vwryEEiFqvYpZEneFxtQCCPOzUOqf5C1OVAmlECUCrFr7ux8FOhnR7GZ7Jbo15mrtvDu5CKNm6kGjzX11JuweBQuiuXkPJqxEgn7utxtL2MB8rsxJUUNnTSlbq82SjeNuVk2W0raKPFM2G7LT6V79lV+hw//8D6Xf+73vxiNUQRAEQQSQIAiCCCP88Y9TTul123G8zefz9cZ9HN3TaJay+zmLDMlMIIUYssScxb2IahLmLfqXR6Lr5G5MZKw6OxGz+xazc7/xqEakbna09eZj50Qn7HAWuLOnRL0uzXvoIBdJtvazmS0Bw9bd3Gp1F18/g3vSlBJmA+qEelfR15wHrXVU5vfOV1dkxyPV85k8vkoVBEEQASQIgiD4/gaShEAiw/C6i5xvU63Xg9k4uM+D6pDNNlmkBY8xmdUkoqgluf8U5j85MBN6AspmyswbIeB+tFoP5l7d/QT/IrQ3kWJEZ+zZqCMi7i621md1b541JTGz5DkfHt1ktLCRc9vd1FoHbbcZZu38vZmIZjw2hQ4CcaMRBEEQASQIgiD4IQkkl5ev5Gn6Ym63JLW+lEVOovrUwDzx+vneC8x+BvrZrDokWijYNb8Qop2bPVSzL6n7fXM/LEGEQKtzJl/rhDmhT2aW4QS/b+O43GpUsxH1hape2zC8ezYjgvx/27drswiCMACgg7s7JVy6BVwVF1MDFUwDaHm4nq+muKdIyvfeWAvz2+ZmuP/n8xkAAKB9K3zq9xsTed6Yqqo42+3GxX7/cCnPd9fSNC43m9trb+fmJq7c3m6tXl3Vli4va4sXF8lCs1mfbTaTuVYrmbu+rs9cXISp4+Mw8hb4fL2vZzD8CQAAIFj5CQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAsAgPRXF312KgAAAABJRU5ErkJggg==\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/CertificateDecoder/CertDecoded.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/CertificateDecoder/CertDecoded.txtdeleted file mode 100644index bffd9b1dd..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/CertificateDecoder/CertDecoded.txt+++ /dev/null@@ -1,17 +0,0 @@-[Subject]- O=Dev Toys, S=Some-State, C=DT--[Issuer]- O=Dev Toys, S=Some-State, C=DT--[Serial Number]- 27C9D3678BC89528786CEC0642454A3971E4FF23--[Not Before]- 4/17/2023 2:40:48 PM--[Not After]- 4/16/2024 2:40:48 PM--[Thumbprint]- 9E5B55F43B571EFE82D386C856506FC96018217Cdiff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/CertificateDecoder/CertWithExtensionsDecoded.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/CertificateDecoder/CertWithExtensionsDecoded.txtdeleted file mode 100644index 8d5362bd8..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/CertificateDecoder/CertWithExtensionsDecoded.txt+++ /dev/null@@ -1,27 +0,0 @@-[Subject]- O=Dev-Toys, S=Some-State, C=DT--[Issuer]- O=Dev-Toys, S=Some-State, C=DT--[Serial Number]- 0A2D679783C5DB71139A0EEB3479D4F7D5C76E79--[Not Before]- 6/2/2023 9:12:03 AM--[Not After]- 5/30/2033 9:12:03 AM--[Thumbprint]- 41D8D90FE633CFF63CED9E4A53889C0133AEF106--[Subject Key Identifier]- 269dfeada0872cc64350792c2558df6fa086c41b--[Authority Key Identifier]- KeyID=269dfeada0872cc64350792c2558df6fa086c41b--[Basic Constraints]- Subject Type=CA- Path Length Constraint=None\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/CertificateDecoder/CertificateRequest.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/CertificateDecoder/CertificateRequest.txtdeleted file mode 100644index 673369901..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/CertificateDecoder/CertificateRequest.txt+++ /dev/null@@ -1,26 +0,0 @@------BEGIN CERTIFICATE REQUEST------MIIEejCCAmICAQAwNTELMAkGA1UEBhMCRFQxEzARBgNVBAgMClNvbWUtU3RhdGUx-ETAPBgNVBAoMCERldiBUb3lzMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC-AgEA25PEtgiFZvzv/MR0UhrRGGdl3opOr7rrK+lPzak3pERnfVtN/vF8054CtI5a-1rzQB80IpULDZSMKLZB7R76k1lTpOOUXkspWeVbRchP0GJHHEndMsAmkGIt4f87S-+KRbHhK+V63sOtPdJbtLUIrHIBAX4Ma8SQfx3OobIrOPVh63oU7NjX0Os0ByD7fK-ObfptFh7bjKQnnAnuDq/hNPCDixbxsZAOG8OYIxKWPggjtQIWPbDu4rTPVcEe/Oy-nRwGKRCJSlM69HcxkDi7MV68g+r8ZaCjgeWOnqqFWZg0Ld1yPItCNbItgwhXda2q-rYv5VsDp7j/APDl0IHTTtEABCnZ1wsf/nJtVnjBk8zxmzHnZK1zjPKAMrOtlming-GE6KnVQLVr0cDHf06uUXcHZWLTVVo0zO3C+Fsbi1lqFlUpNtySRX2YC3Htz7FMCW-PHS5rPp8jO+eHOKoGiTFBBMubIoAdc909qiYxr9Dmu5qkE9/AjD3GA4LPKMNSfXV-9Q75bTvgXhXth83xpF2jF1qxThz9LcV68lmo+xeBAB5wRN7BcV1tfYMVOzwhH9jP-pQd5loyOOXmDqVUAt780W+aqnmwub1NkzuFpAbeE/2iz8SXphcgr1jKCF//kV1ff-Fujw+ljWq6hW4zRuAdA6zozkkZGbTZULfM1XRYNIdtWwaHUCAwEAAaAAMA0GCSqG-SIb3DQEBCwUAA4ICAQAiwhSDlLWBu3Yz1mMY5Bq8sZAy9V0vE6bl3RnoytLBczum-w/YSsUaI3BcJDPd+VoHd4clwlwQd5jcPh2iJmgW8qrH85PolUSACHgZklX4n8NI2-8o3JLO0o7JtvIns5z9useFqlp+hh9Y9IzZP2ydww6mxMzp0+olqhnnwIQERj6W76-43CsZhFTdOwqUEX7YDDzdtjKPfeLrN/QuQ3ZkZ+uOGPl+saqyCX/uqnzzypXDCpx-1+CoEhgxcd7HEZO/oT8PO8sZhwpr7x8fjZP3cUl42gegyAziai5mpDJ+duu4Jnkd-3yYN+rCFN0BSpvHJvC1ydVlntIt+yhIZe706OcFvXaIXSJku2PZpv7RFwn7+Fygo-WPKppbJVQGPw8/W6S4BJfw2mqkA4PItb7+NAC7xBEDaJ9JuxRkKoqaNbonZW8Vwy-YPuKozq1YEpCDNFdP0JWUCXboFm7gOAHdGiYBMSYtCqI62C3EhVBKXcyNXqL4URF-bldpOo9HJ/uYCU8wIfQxCMeZTdQOs1rX6CnXrSknz3jJqkytjn4b1ltWOtFzqs64-g41z4JMbh1zbm2xp2VoHTW9XAfr64/J5kJpf6EQcDkmEhb9Wz5PphjMgIEHfYCWb-dX+wpfqTJYWcw64txwyskqsxizFsZ4zTMObcHy6Q/puVlO9LtO4FW59Kd7YrAw==------END CERTIFICATE REQUEST-----\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/CertificateDecoder/PemCertPublic.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/CertificateDecoder/PemCertPublic.txtdeleted file mode 100644index eca6d3c2d..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/CertificateDecoder/PemCertPublic.txt+++ /dev/null@@ -1,29 +0,0 @@------BEGIN CERTIFICATE------MIIE8TCCAtkCFCfJ02eLyJUoeGzsBkJFSjlx5P8jMA0GCSqGSIb3DQEBCwUAMDUx-CzAJBgNVBAYTAkRUMRMwEQYDVQQIDApTb21lLVN0YXRlMREwDwYDVQQKDAhEZXYg-VG95czAeFw0yMzA0MTcxNDQwNDhaFw0yNDA0MTYxNDQwNDhaMDUxCzAJBgNVBAYT-AkRUMRMwEQYDVQQIDApTb21lLVN0YXRlMREwDwYDVQQKDAhEZXYgVG95czCCAiIw-DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANuTxLYIhWb87/zEdFIa0RhnZd6K-Tq+66yvpT82pN6REZ31bTf7xfNOeArSOWta80AfNCKVCw2UjCi2Qe0e+pNZU6Tjl-F5LKVnlW0XIT9BiRxxJ3TLAJpBiLeH/O0vikWx4Svlet7DrT3SW7S1CKxyAQF+DG-vEkH8dzqGyKzj1Yet6FOzY19DrNAcg+3yjm36bRYe24ykJ5wJ7g6v4TTwg4sW8bG-QDhvDmCMSlj4II7UCFj2w7uK0z1XBHvzsp0cBikQiUpTOvR3MZA4uzFevIPq/GWg-o4Hljp6qhVmYNC3dcjyLQjWyLYMIV3Wtqq2L+VbA6e4/wDw5dCB007RAAQp2dcLH-/5ybVZ4wZPM8Zsx52Stc4zygDKzrZZop4BhOip1UC1a9HAx39OrlF3B2Vi01VaNM-ztwvhbG4tZahZVKTbckkV9mAtx7c+xTAljx0uaz6fIzvnhziqBokxQQTLmyKAHXP-dPaomMa/Q5ruapBPfwIw9xgOCzyjDUn11fUO+W074F4V7YfN8aRdoxdasU4c/S3F-evJZqPsXgQAecETewXFdbX2DFTs8IR/Yz6UHeZaMjjl5g6lVALe/NFvmqp5sLm9T-ZM7haQG3hP9os/El6YXIK9Yyghf/5FdX3xbo8PpY1quoVuM0bgHQOs6M5JGRm02V-C3zNV0WDSHbVsGh1AgMBAAEwDQYJKoZIhvcNAQELBQADggIBAA+IHRcqvIzjPDGX-JSQQA/vadD2EmZDfY3HKTxvwXyRfn/9i0R0yKuMuZm9cgexVIHDHeark0PsvkJwh-Y7wXD5uNDq3kXPeHX3+xMLA6skBMYZT2lFBJrwUTGlNnJHBaJfBU+VvKNzDcMfRk-tp62PJyXP4qfcSGDDruaoqqmvzyaSyOdbsinQmWrxvd0Tio3JjQbD8dZNjc6E0Vl-aTQS7NggdBlt4Yp85k6VXEJFhVVwrJDrRftH7efp6ekT7MivrRQpEfb113gl2xuG-3JH2xQdFnmL3z5vSlS/ffkGdHUNZPib3CM1w/sG+9DrMK60CVWKVogF3YEg5pp9Q-OsdEabkiDPwZTDh9tm8cmfVckke7YzpPEw5mqJfsYa9MpwLVMsniCRNpfoZUoFNT-0kGu19K8+PVkNlhqOfzxaqHnjRIY5wytDY18JecSkmKlg8VSBZft7C3cxni27kxC-WWrZ6LI8sk0uO+NZPB/68Iz6Qf1VkSVgvDSN7aehpYQq3Gv73CQeJS9tyZ77RSqE-nqWDyI4+nwJNZN3VURGle1/5XOHNLlFnarVj2r9AGR3P5McwPocWm5Dw5rwf0pXf-psZA0Q7ZlBVnEArftIGFNa8UoUGR2Lo89gLJsDhqUkCVEy2zxD8FdrxZVdW1KtaT-ixUiDYhfU7a41ebpMlwMfA+QAuK0------END CERTIFICATE-----\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/CertificateDecoder/PemCertPublicWithExtensions.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/CertificateDecoder/PemCertPublicWithExtensions.txtdeleted file mode 100644index f119c24df..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/CertificateDecoder/PemCertPublicWithExtensions.txt+++ /dev/null@@ -1,31 +0,0 @@------BEGIN CERTIFICATE------MIIFSzCCAzOgAwIBAgIUCi1nl4PF23ETmg7rNHnU99XHbnkwDQYJKoZIhvcNAQEL-BQAwNTELMAkGA1UEBhMCRFQxEzARBgNVBAgMClNvbWUtU3RhdGUxETAPBgNVBAoM-CERldi1Ub3lzMB4XDTIzMDYwMjEzMTIwM1oXDTMzMDUzMDEzMTIwM1owNTELMAkG-A1UEBhMCRFQxEzARBgNVBAgMClNvbWUtU3RhdGUxETAPBgNVBAoMCERldi1Ub3lz-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuxTovybg74QlGSo7lGlX-Kxz7nq0Mfvulj+t2NVfGXEu6VUTaDZNDYwynRR397N82RKsYt17dSkjUYWZI5nsu-QfH9LJIlstokqu+6/CXA5T79TGNYVz9iFbMQXNy+M2zLaO42LCOHUs8oYFB5FXL7-x6nXmtsJUB0eITPc2wrKCN7SY3QuMZ/A6Bn2dVJ+7+2SwCRLv7SDDGX/jxiLCxXn-tdmgv/PKQnxq0JXIi3n1BOrdz6e9DYDMjPR5FkZWh0TEjFMpCSxqq/IfQc/DNYii-ragXuvoVpLHswRu4C8ytksZYEg+RjozqjTpVI4c++xXQpNK4zIs0bI6bkczj4T97-WEzE3xE90RD7gG09tEL7/dKeok5o0zC6N+1rNTPMKTwDPEUig8uNcplN7W5vWehi-ixJGceIFb91zMr+W1ImY39cFllQZnQrBvfsoq0IxHaadYjdvA/C2H1FsFPT4SgSH-D/9HgWyu1wAt7e/xcHa9OM71ac1SpXN2br0Up0P4STXPeolf5I0BsAffNdRrKRM0-cSZpftnM/gFjoJVcd2unVA4suFoXArHGSRKdqPb3XjnqcFU7MjHDycRXzhfUj90a-Th9pg6lovY1gq9TS8vfNC6zd/W2GcxDD2+ONjsGBnfmF4BLo9eVeMu3kvtMG9l09-JZZKqQc0x9IxwTZx1JP2CVUCAwEAAaNTMFEwHQYDVR0OBBYEFCad/q2ghyzGQ1B5-LCVY32+ghsQbMB8GA1UdIwQYMBaAFCad/q2ghyzGQ1B5LCVY32+ghsQbMA8GA1Ud-EwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAG+/mgWf0zhVXcbZKgrvBqsM-a5qiJPUp4JSjUtUs5TGQRM5HICS+flgzhUa55xDjy9q5Lv3FI04KwT6K8XaSGBGr-zkp2Vyxn5DDboYK2FiJEHJojGzqElOELdOSbMYLO8bLY7SK3eH8pMuy6jPOqABOp-hpVAWhrhvDoBsREwXZDD1CrlorfBCM5ue2Xa1elH3qswG3HkKWq+Ieis8AlFvx7i-JPzw5KTGBdAZzsakF1KN9qC9Xjzoc526yo0RvlsOjK0i9XKpWkjE2pAE/jpqcapZ-Y+mgKJe9wl+ZfZ1Z2AEk9U/T4aZMmxsqo5z3ztjuB290oxR8dnfJlZobAOyFnA3G-5y1/s1Sw0hmKpY7563/c+vvWBwq48R1hYOLB5UsNBSijD+KyAii+ATd0yp/ItPb0-Ng5ek4rln1BaCumKTJ4WAMBDtqBFCVd0xNidRoI1Ljug8+MPafVzw8KIYP1FrnOy-Vx0sorzO7j2T2rLtTO/RrCbVErBHHyHvLLjxeKnVdc1khtBG/MQv6zkb2w8oxl/9-6BmGhbw4S5Ti33qO4r1bs8if1zzZJgckcf7f7DPzNvBslUlARy6Kz3CRc2sK9lwm-JIff9Js+BoWwO3KGDnk8paJf/YNBc1qaiFQTHOBCOefqOaTiHG5TGSklO7Ij+xNx-ulEjWxGlNtL7tLMeToVU------END CERTIFICATE-----\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/CertificateDecoder/PemCertWithPrivateKey.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/CertificateDecoder/PemCertWithPrivateKey.txtdeleted file mode 100644index 5e5817b67..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/CertificateDecoder/PemCertWithPrivateKey.txt+++ /dev/null@@ -1,82 +0,0 @@------BEGIN PRIVATE KEY------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-LVv3WFLNswm3oiS3VnDGaPnuwZZFpBI=------END PRIVATE KEY------------BEGIN CERTIFICATE------MIIE8TCCAtkCFCfJ02eLyJUoeGzsBkJFSjlx5P8jMA0GCSqGSIb3DQEBCwUAMDUx-CzAJBgNVBAYTAkRUMRMwEQYDVQQIDApTb21lLVN0YXRlMREwDwYDVQQKDAhEZXYg-VG95czAeFw0yMzA0MTcxNDQwNDhaFw0yNDA0MTYxNDQwNDhaMDUxCzAJBgNVBAYT-AkRUMRMwEQYDVQQIDApTb21lLVN0YXRlMREwDwYDVQQKDAhEZXYgVG95czCCAiIw-DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANuTxLYIhWb87/zEdFIa0RhnZd6K-Tq+66yvpT82pN6REZ31bTf7xfNOeArSOWta80AfNCKVCw2UjCi2Qe0e+pNZU6Tjl-F5LKVnlW0XIT9BiRxxJ3TLAJpBiLeH/O0vikWx4Svlet7DrT3SW7S1CKxyAQF+DG-vEkH8dzqGyKzj1Yet6FOzY19DrNAcg+3yjm36bRYe24ykJ5wJ7g6v4TTwg4sW8bG-QDhvDmCMSlj4II7UCFj2w7uK0z1XBHvzsp0cBikQiUpTOvR3MZA4uzFevIPq/GWg-o4Hljp6qhVmYNC3dcjyLQjWyLYMIV3Wtqq2L+VbA6e4/wDw5dCB007RAAQp2dcLH-/5ybVZ4wZPM8Zsx52Stc4zygDKzrZZop4BhOip1UC1a9HAx39OrlF3B2Vi01VaNM-ztwvhbG4tZahZVKTbckkV9mAtx7c+xTAljx0uaz6fIzvnhziqBokxQQTLmyKAHXP-dPaomMa/Q5ruapBPfwIw9xgOCzyjDUn11fUO+W074F4V7YfN8aRdoxdasU4c/S3F-evJZqPsXgQAecETewXFdbX2DFTs8IR/Yz6UHeZaMjjl5g6lVALe/NFvmqp5sLm9T-ZM7haQG3hP9os/El6YXIK9Yyghf/5FdX3xbo8PpY1quoVuM0bgHQOs6M5JGRm02V-C3zNV0WDSHbVsGh1AgMBAAEwDQYJKoZIhvcNAQELBQADggIBAA+IHRcqvIzjPDGX-JSQQA/vadD2EmZDfY3HKTxvwXyRfn/9i0R0yKuMuZm9cgexVIHDHeark0PsvkJwh-Y7wXD5uNDq3kXPeHX3+xMLA6skBMYZT2lFBJrwUTGlNnJHBaJfBU+VvKNzDcMfRk-tp62PJyXP4qfcSGDDruaoqqmvzyaSyOdbsinQmWrxvd0Tio3JjQbD8dZNjc6E0Vl-aTQS7NggdBlt4Yp85k6VXEJFhVVwrJDrRftH7efp6ekT7MivrRQpEfb113gl2xuG-3JH2xQdFnmL3z5vSlS/ffkGdHUNZPib3CM1w/sG+9DrMK60CVWKVogF3YEg5pp9Q-OsdEabkiDPwZTDh9tm8cmfVckke7YzpPEw5mqJfsYa9MpwLVMsniCRNpfoZUoFNT-0kGu19K8+PVkNlhqOfzxaqHnjRIY5wytDY18JecSkmKlg8VSBZft7C3cxni27kxC-WWrZ6LI8sk0uO+NZPB/68Iz6Qf1VkSVgvDSN7aehpYQq3Gv73CQeJS9tyZ77RSqE-nqWDyI4+nwJNZN3VURGle1/5XOHNLlFnarVj2r9AGR3P5McwPocWm5Dw5rwf0pXf-psZA0Q7ZlBVnEArftIGFNa8UoUGR2Lo89gLJsDhqUkCVEy2zxD8FdrxZVdW1KtaT-ixUiDYhfU7a41ebpMlwMfA+QAuK0------END CERTIFICATE-----\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/CertificateDecoder/PemCertWithPrivateKeyWithExtensions.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/CertificateDecoder/PemCertWithPrivateKeyWithExtensions.txtdeleted file mode 100644index dc4375ece..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/CertificateDecoder/PemCertWithPrivateKeyWithExtensions.txt+++ /dev/null@@ -1,84 +0,0 @@------BEGIN PRIVATE KEY------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-6WNJmQTHY+2bURcR9d1vIO3eGkCrGvs=------END PRIVATE KEY------------BEGIN CERTIFICATE------MIIFSzCCAzOgAwIBAgIUCi1nl4PF23ETmg7rNHnU99XHbnkwDQYJKoZIhvcNAQEL-BQAwNTELMAkGA1UEBhMCRFQxEzARBgNVBAgMClNvbWUtU3RhdGUxETAPBgNVBAoM-CERldi1Ub3lzMB4XDTIzMDYwMjEzMTIwM1oXDTMzMDUzMDEzMTIwM1owNTELMAkG-A1UEBhMCRFQxEzARBgNVBAgMClNvbWUtU3RhdGUxETAPBgNVBAoMCERldi1Ub3lz-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuxTovybg74QlGSo7lGlX-Kxz7nq0Mfvulj+t2NVfGXEu6VUTaDZNDYwynRR397N82RKsYt17dSkjUYWZI5nsu-QfH9LJIlstokqu+6/CXA5T79TGNYVz9iFbMQXNy+M2zLaO42LCOHUs8oYFB5FXL7-x6nXmtsJUB0eITPc2wrKCN7SY3QuMZ/A6Bn2dVJ+7+2SwCRLv7SDDGX/jxiLCxXn-tdmgv/PKQnxq0JXIi3n1BOrdz6e9DYDMjPR5FkZWh0TEjFMpCSxqq/IfQc/DNYii-ragXuvoVpLHswRu4C8ytksZYEg+RjozqjTpVI4c++xXQpNK4zIs0bI6bkczj4T97-WEzE3xE90RD7gG09tEL7/dKeok5o0zC6N+1rNTPMKTwDPEUig8uNcplN7W5vWehi-ixJGceIFb91zMr+W1ImY39cFllQZnQrBvfsoq0IxHaadYjdvA/C2H1FsFPT4SgSH-D/9HgWyu1wAt7e/xcHa9OM71ac1SpXN2br0Up0P4STXPeolf5I0BsAffNdRrKRM0-cSZpftnM/gFjoJVcd2unVA4suFoXArHGSRKdqPb3XjnqcFU7MjHDycRXzhfUj90a-Th9pg6lovY1gq9TS8vfNC6zd/W2GcxDD2+ONjsGBnfmF4BLo9eVeMu3kvtMG9l09-JZZKqQc0x9IxwTZx1JP2CVUCAwEAAaNTMFEwHQYDVR0OBBYEFCad/q2ghyzGQ1B5-LCVY32+ghsQbMB8GA1UdIwQYMBaAFCad/q2ghyzGQ1B5LCVY32+ghsQbMA8GA1Ud-EwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAG+/mgWf0zhVXcbZKgrvBqsM-a5qiJPUp4JSjUtUs5TGQRM5HICS+flgzhUa55xDjy9q5Lv3FI04KwT6K8XaSGBGr-zkp2Vyxn5DDboYK2FiJEHJojGzqElOELdOSbMYLO8bLY7SK3eH8pMuy6jPOqABOp-hpVAWhrhvDoBsREwXZDD1CrlorfBCM5ue2Xa1elH3qswG3HkKWq+Ieis8AlFvx7i-JPzw5KTGBdAZzsakF1KN9qC9Xjzoc526yo0RvlsOjK0i9XKpWkjE2pAE/jpqcapZ-Y+mgKJe9wl+ZfZ1Z2AEk9U/T4aZMmxsqo5z3ztjuB290oxR8dnfJlZobAOyFnA3G-5y1/s1Sw0hmKpY7563/c+vvWBwq48R1hYOLB5UsNBSijD+KyAii+ATd0yp/ItPb0-Ng5ek4rln1BaCumKTJ4WAMBDtqBFCVd0xNidRoI1Ljug8+MPafVzw8KIYP1FrnOy-Vx0sorzO7j2T2rLtTO/RrCbVErBHHyHvLLjxeKnVdc1khtBG/MQv6zkb2w8oxl/9-6BmGhbw4S5Ti33qO4r1bs8if1zzZJgckcf7f7DPzNvBslUlARy6Kz3CRc2sK9lwm-JIff9Js+BoWwO3KGDnk8paJf/YNBc1qaiFQTHOBCOefqOaTiHG5TGSklO7Ij+xNx-ulEjWxGlNtL7tLMeToVU------END CERTIFICATE-----diff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/CertificateDecoder/PfxNoPassword.pfx b/src/app/tests/DevToys.UnitTests/Tools/TestData/CertificateDecoder/PfxNoPassword.pfxdeleted file mode 100644index 06fe6c188..000000000Binary files a/src/app/tests/DevToys.UnitTests/Tools/TestData/CertificateDecoder/PfxNoPassword.pfx and /dev/null differdiff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/CertificateDecoder/PfxWithExtensionsNoPassword.pfx b/src/app/tests/DevToys.UnitTests/Tools/TestData/CertificateDecoder/PfxWithExtensionsNoPassword.pfxdeleted file mode 100644index 3b8fc9cc1..000000000Binary files a/src/app/tests/DevToys.UnitTests/Tools/TestData/CertificateDecoder/PfxWithExtensionsNoPassword.pfx and /dev/null differdiff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/CertificateDecoder/PfxWithPassword.pfx b/src/app/tests/DevToys.UnitTests/Tools/TestData/CertificateDecoder/PfxWithPassword.pfxdeleted file mode 100644index 797c1fcbe..000000000Binary files a/src/app/tests/DevToys.UnitTests/Tools/TestData/CertificateDecoder/PfxWithPassword.pfx and /dev/null differdiff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/HashAndChecksumGenerator/Checksum.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/HashAndChecksumGenerator/Checksum.txtdeleted file mode 100644index ca7708228..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/HashAndChecksumGenerator/Checksum.txt+++ /dev/null@@ -1 +0,0 @@-8B1A9953C4611296A827ABF8C47804D7\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/HashAndChecksumGenerator/File.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/HashAndChecksumGenerator/File.txtdeleted file mode 100644index 70c379b63..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/HashAndChecksumGenerator/File.txt+++ /dev/null@@ -1 +0,0 @@-Hello world\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonPathTester/sample.json b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonPathTester/sample.jsondeleted file mode 100644index 2876c5306..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonPathTester/sample.json+++ /dev/null@@ -1,20 +0,0 @@-{- "firstName": "John",- "lastName": "doe",- "age": 26,- "address": {- "streetAddress": "naist street",- "city": "Nara",- "postalCode": "630-0192"- },- "phoneNumbers": [- {- "type": "iPhone",- "number": "0123-4567-8888"- },- {- "type": "home",- "number": "0123-4567-8910"- }- ]-}\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/BasicPayload.json b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/BasicPayload.jsondeleted file mode 100644index f35d3e8f5..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/BasicPayload.json+++ /dev/null@@ -1,22 +0,0 @@-{- "sub": "1234567890",- "name": "John Doe",- "object": {- "ObjectProperty": "object value"- },- "objectOfObject": {- "object": {- "ObjectProperty": "object value"- }- },- "array": [- "array value"- ],- "arrayOfObject": [- {- "object": {- "ObjectProperty": "object value"- }- }- ]-}\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ComplexPayload.json b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ComplexPayload.jsondeleted file mode 100644index 22a3f5c9e..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ComplexPayload.json+++ /dev/null@@ -1,31 +0,0 @@-{- "sub": "1234567890",- "name": "John Doe",- "true": true,- "false": false,- "long": 1234567890,- "decimal": 1234567890.123,- "object": {- "ObjectProperty": "object value"- },- "objectOfObject": {- "object": {- "ObjectProperty": "object value"- }- },- "array": [- "array value"- ],- "arrayOfObject": [- {- "object": {- "ObjectProperty": "object value"- }- }- ],- "nbf": 1661092370,- "exp": 1661095970,- "iat": 1661092370,- "iss": "devtoys",- "aud": "devtoys"-}\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ES/ES256-ComplexToken.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ES/ES256-ComplexToken.txtdeleted file mode 100644index d7d21c898..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ES/ES256-ComplexToken.txt+++ /dev/null@@ -1 +0,0 @@-eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwidHJ1ZSI6dHJ1ZSwiZmFsc2UiOmZhbHNlLCJsb25nIjoxMjM0NTY3ODkwLCJkZWNpbWFsIjoxMjM0NTY3ODkwLjEyMywib2JqZWN0Ijp7Ik9iamVjdFByb3BlcnR5Ijoib2JqZWN0IHZhbHVlIn0sIm9iamVjdE9mT2JqZWN0Ijp7Im9iamVjdCI6eyJPYmplY3RQcm9wZXJ0eSI6Im9iamVjdCB2YWx1ZSJ9fSwiYXJyYXkiOlsiYXJyYXkgdmFsdWUiXSwiYXJyYXlPZk9iamVjdCI6W3sib2JqZWN0Ijp7Ik9iamVjdFByb3BlcnR5Ijoib2JqZWN0IHZhbHVlIn19XSwibmJmIjoxNjYxMDkyMzcwLCJleHAiOjE2NjEwOTU5NzAsImlhdCI6MTY2MTA5MjM3MCwiaXNzIjoiZGV2dG95cyIsImF1ZCI6ImRldnRveXMifQ.3_e8d7otRqRkIm-L0hwgFKsUho3WTfNfIKHmVwJH0I6aUob1pY4mJj6h2nAEJw5XIfDamhYcaAtaGI2p9PS4JA\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ES/ES256-Header.json b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ES/ES256-Header.jsondeleted file mode 100644index e7429b83b..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ES/ES256-Header.json+++ /dev/null@@ -1,4 +0,0 @@-{- "alg": "ES256",- "typ": "JWT"-}\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ES/ES256-PrivateKey.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ES/ES256-PrivateKey.txtdeleted file mode 100644index d3def8d62..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ES/ES256-PrivateKey.txt+++ /dev/null@@ -1,5 +0,0 @@------BEGIN PRIVATE KEY------MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgclXGo+zWHJe5FiAU-1tudbbtFAbw+9jbPL/YvJsrXe16hRANCAASEv1LsNlkacvJdr+7cLf8x4+FBaU1g-4FO8FxWamWGlGK1iT6gCKz5Ge/U7kRTd+L1dBL4kJikllPsQSdOLi+G+------END PRIVATE KEY-----diff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ES/ES256-PublicKey.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ES/ES256-PublicKey.txtdeleted file mode 100644index a50756890..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ES/ES256-PublicKey.txt+++ /dev/null@@ -1,4 +0,0 @@------BEGIN PUBLIC KEY------MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEhL9S7DZZGnLyXa/u3C3/MePhQWlN-YOBTvBcVmplhpRitYk+oAis+Rnv1O5EU3fi9XQS+JCYpJZT7EEnTi4vhvg==------END PUBLIC KEY-----diff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ES/ES384-ComplexToken.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ES/ES384-ComplexToken.txtdeleted file mode 100644index a0b4cb001..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ES/ES384-ComplexToken.txt+++ /dev/null@@ -1 +0,0 @@-eyJhbGciOiJFUzM4NCIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwidHJ1ZSI6dHJ1ZSwiZmFsc2UiOmZhbHNlLCJsb25nIjoxMjM0NTY3ODkwLCJkZWNpbWFsIjoxMjM0NTY3ODkwLjEyMywib2JqZWN0Ijp7Ik9iamVjdFByb3BlcnR5Ijoib2JqZWN0IHZhbHVlIn0sIm9iamVjdE9mT2JqZWN0Ijp7Im9iamVjdCI6eyJPYmplY3RQcm9wZXJ0eSI6Im9iamVjdCB2YWx1ZSJ9fSwiYXJyYXkiOlsiYXJyYXkgdmFsdWUiXSwiYXJyYXlPZk9iamVjdCI6W3sib2JqZWN0Ijp7Ik9iamVjdFByb3BlcnR5Ijoib2JqZWN0IHZhbHVlIn19XSwibmJmIjoxNjYxMDkyMzcwLCJleHAiOjE2NjEwOTU5NzAsImlhdCI6MTY2MTA5MjM3MCwiaXNzIjoiZGV2dG95cyIsImF1ZCI6ImRldnRveXMifQ.k-q7Lgj_oZWbq4JD0Lo42N1I-qebKZs6rlJvffFWic0zjBlrVTbQl7UIypjBXqTCxdJHf6tGni8ZFi8rYRRytakGogvnn1VDlLklevLUa7UgxGwv7jzJXrgc0gFkCAB_\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ES/ES384-Header.json b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ES/ES384-Header.jsondeleted file mode 100644index afdb14b11..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ES/ES384-Header.json+++ /dev/null@@ -1,4 +0,0 @@-{- "alg": "ES384",- "typ": "JWT"-}\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ES/ES384-PrivateKey.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ES/ES384-PrivateKey.txtdeleted file mode 100644index 468234933..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ES/ES384-PrivateKey.txt+++ /dev/null@@ -1,8 +0,0 @@------BEGIN PRIVATE KEY------MIHuAgEAMBAGByqGSM49AgEGBSuBBAAjBIHWMIHTAgEBBEIB071rtVw4pgX+3nOf-pld4rB5ktQwhlbCvz9mgHSSo2QIA9IgR8YRT/yJZelywZ0dFo5WU+s9JyG3a/GUx-cFVkvyehgYkDgYYABAHxURk7lO/eDrm6aHMrI1viZNuOzlnq/WJFAloywCuto7vf-ldPRQf7EFhmP7dWmVPEJ71pmoMPq/cRNm639/83oJwGWA3nK/SFY/9rQtDX/sW+y-G1pwJtXYLXpn81ezjcWSJ+V14IfDFJGvO1ynRUdF3LYTSdR5DNHAfFWBUiCxQfYA-qA==------END PRIVATE KEY-----diff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ES/ES384-PublicKey.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ES/ES384-PublicKey.txtdeleted file mode 100644index 1b65a0963..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ES/ES384-PublicKey.txt+++ /dev/null@@ -1,5 +0,0 @@------BEGIN PUBLIC KEY------MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEO9dpn/Frvw60BjdaO6XzvhwjBR9f1sRi-1ozSmiRHjlBr+MP0f9V0lUswUsdyRtOidtDMOrpi4ee423eFF5ejj2QPH0s/a+sq-HsPjoK4pHkMpRvZySAHpAafApxdH9O/U------END PUBLIC KEY-----diff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ES/ES512-ComplexToken.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ES/ES512-ComplexToken.txtdeleted file mode 100644index f9d81e314..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ES/ES512-ComplexToken.txt+++ /dev/null@@ -1 +0,0 @@-eyJhbGciOiJFUzUxMiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwidHJ1ZSI6dHJ1ZSwiZmFsc2UiOmZhbHNlLCJsb25nIjoxMjM0NTY3ODkwLCJkZWNpbWFsIjoxMjM0NTY3ODkwLjEyMywib2JqZWN0Ijp7Ik9iamVjdFByb3BlcnR5Ijoib2JqZWN0IHZhbHVlIn0sIm9iamVjdE9mT2JqZWN0Ijp7Im9iamVjdCI6eyJPYmplY3RQcm9wZXJ0eSI6Im9iamVjdCB2YWx1ZSJ9fSwiYXJyYXkiOlsiYXJyYXkgdmFsdWUiXSwiYXJyYXlPZk9iamVjdCI6W3sib2JqZWN0Ijp7Ik9iamVjdFByb3BlcnR5Ijoib2JqZWN0IHZhbHVlIn19XSwibmJmIjoxNjYxMDkyMzcwLCJleHAiOjE2NjEwOTU5NzAsImlhdCI6MTY2MTA5MjM3MCwiaXNzIjoiZGV2dG95cyIsImF1ZCI6ImRldnRveXMifQ.ACDv2PhgBA6frpNkbY3-G2mRNXOHRJfzmROZGfFYwy5OOtzX5spM94ls5noSeZBvwxIOJQ7IwaQXUXMVlgJyExQfAYvpvYCByc5amJXgEG49MuG6_i5q7VxGIKo1vHmCZN9tGbpbj-rAKZbHrZ-0QNISOPpXQXauh0qtEyafvf99cdVc\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ES/ES512-Header.json b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ES/ES512-Header.jsondeleted file mode 100644index 4e65ddfd6..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ES/ES512-Header.json+++ /dev/null@@ -1,4 +0,0 @@-{- "alg": "ES512",- "typ": "JWT"-}\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ES/ES512-PrivateKey.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ES/ES512-PrivateKey.txtdeleted file mode 100644index 6736e375f..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ES/ES512-PrivateKey.txt+++ /dev/null@@ -1,8 +0,0 @@------BEGIN PRIVATE KEY------MIHuAgEAMBAGByqGSM49AgEGBSuBBAAjBIHWMIHTAgEBBEIBsy6Ic047Q9FEKpsJ-6tHrBJ/GIaP1jRl3nJEbSiGzqFzdhVrFhC+QxQWiUgvPSQ4BFNvl1zg3u82eUGnu-cQQJ/8ahgYkDgYYABABWSTEDxTbp6HQ59NvuQI9YsfV0cYc2OUJPHStoYX54FOKi-H6C8TlzCmzewyWF8Svu/SdcHfauWD4m9JmqrHpe+6AALLS0UMDd6GFIgZLTvr8sx-qrcmZ/+Jv9i91vhvqlFRBK6xc/vPLmcZWiazfEthzpZfZG6lqerO935ElOsCKzIR-3g==------END PRIVATE KEY-----diff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ES/ES512-PublicKey.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ES/ES512-PublicKey.txtdeleted file mode 100644index 92521364b..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/ES/ES512-PublicKey.txt+++ /dev/null@@ -1,6 +0,0 @@------BEGIN PUBLIC KEY------MIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQB8VEZO5Tv3g65umhzKyNb4mTbjs5Z-6v1iRQJaMsArraO735XT0UH+xBYZj+3VplTxCe9aZqDD6v3ETZut/f/N6CcBlgN5-yv0hWP/a0LQ1/7FvshtacCbV2C16Z/NXs43FkifldeCHwxSRrztcp0VHRdy2E0nU-eQzRwHxVgVIgsUH2AKg=------END PUBLIC KEY-----diff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/HS/HS256-BasicToken.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/HS/HS256-BasicToken.txtdeleted file mode 100644index d44fc3164..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/HS/HS256-BasicToken.txt+++ /dev/null@@ -1 +0,0 @@-eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwib2JqZWN0Ijp7Ik9iamVjdFByb3BlcnR5Ijoib2JqZWN0IHZhbHVlIn0sIm9iamVjdE9mT2JqZWN0Ijp7Im9iamVjdCI6eyJPYmplY3RQcm9wZXJ0eSI6Im9iamVjdCB2YWx1ZSJ9fSwiYXJyYXkiOlsiYXJyYXkgdmFsdWUiXSwiYXJyYXlPZk9iamVjdCI6W3sib2JqZWN0Ijp7Ik9iamVjdFByb3BlcnR5Ijoib2JqZWN0IHZhbHVlIn19XSwiaWF0IjoxNzAzNzcxNTgxLCJpc3MiOiJkZXZ0b3lzIiwiYXVkIjoiZGV2dG95cyJ9.3COWqfXw4cfUXuz8TPCb1iyqxk38recPQrZ38z2_0uA\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/HS/HS256-ComplexToken.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/HS/HS256-ComplexToken.txtdeleted file mode 100644index 8b423b37e..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/HS/HS256-ComplexToken.txt+++ /dev/null@@ -1 +0,0 @@-eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwidHJ1ZSI6dHJ1ZSwiZmFsc2UiOmZhbHNlLCJsb25nIjoxMjM0NTY3ODkwLCJkZWNpbWFsIjoxMjM0NTY3ODkwLjEyMywib2JqZWN0Ijp7Ik9iamVjdFByb3BlcnR5Ijoib2JqZWN0IHZhbHVlIn0sIm9iamVjdE9mT2JqZWN0Ijp7Im9iamVjdCI6eyJPYmplY3RQcm9wZXJ0eSI6Im9iamVjdCB2YWx1ZSJ9fSwiYXJyYXkiOlsiYXJyYXkgdmFsdWUiXSwiYXJyYXlPZk9iamVjdCI6W3sib2JqZWN0Ijp7Ik9iamVjdFByb3BlcnR5Ijoib2JqZWN0IHZhbHVlIn19XSwibmJmIjoxNjYxMDkyMzcwLCJleHAiOjE2NjEwOTU5NzAsImlhdCI6MTY2MTA5MjM3MCwiaXNzIjoiZGV2dG95cyIsImF1ZCI6ImRldnRveXMifQ.taVhS7pJCx2SPpUE7TVf_A67fHA4Fea4-hHtRkDwoiY\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/HS/HS256-Header.json b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/HS/HS256-Header.jsondeleted file mode 100644index 7275522b4..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/HS/HS256-Header.json+++ /dev/null@@ -1,4 +0,0 @@-{- "alg": "HS256",- "typ": "JWT"-}\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/HS/HS256-Signature.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/HS/HS256-Signature.txtdeleted file mode 100644index b60c0e871..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/HS/HS256-Signature.txt+++ /dev/null@@ -1 +0,0 @@-Ym7AD3OT2kpuIRcVAXCweYhV64B0Oi9ETAO6XRbqB8LDL3tF4bMk9x/59PljcGbP5v38BSzCjD1VTwuO6iWA8uzDVAjw2fMNfcT2/LyRlMOsynblo3envlivtgHnKkZj6HqRrG5ltgwy5NsCQ7WwwYPkldhLTF+wUYAnq28+QnU=\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS256-ComplexToken.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS256-ComplexToken.txtdeleted file mode 100644index 4f2c0efe4..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS256-ComplexToken.txt+++ /dev/null@@ -1 +0,0 @@-eyJhbGciOiJQUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwidHJ1ZSI6dHJ1ZSwiZmFsc2UiOmZhbHNlLCJsb25nIjoxMjM0NTY3ODkwLCJkZWNpbWFsIjoxMjM0NTY3ODkwLjEyMywib2JqZWN0Ijp7Ik9iamVjdFByb3BlcnR5Ijoib2JqZWN0IHZhbHVlIn0sIm9iamVjdE9mT2JqZWN0Ijp7Im9iamVjdCI6eyJPYmplY3RQcm9wZXJ0eSI6Im9iamVjdCB2YWx1ZSJ9fSwiYXJyYXkiOlsiYXJyYXkgdmFsdWUiXSwiYXJyYXlPZk9iamVjdCI6W3sib2JqZWN0Ijp7Ik9iamVjdFByb3BlcnR5Ijoib2JqZWN0IHZhbHVlIn19XSwibmJmIjoxNjYxMDkyMzcwLCJleHAiOjE2NjEwOTU5NzAsImlhdCI6MTY2MTA5MjM3MCwiaXNzIjoiZGV2dG95cyIsImF1ZCI6ImRldnRveXMifQ.OMeZLP_3fHmJIGeXOx62zh2ACBbMa19kcNw3JVsE2Y4XB4AtcgF6eyIOLxCQF-tkkbJP1uRqsuY8eDz94pyxANTI_vLuwHoDLHtBCzXRsCops9xaEk0AkTsUbSjyYCkb6vY3I4655PKwYwT-HJVtzb_yZjkBZc9gxv7MzWhh5Oi5Wighc-Dj1nfaySD0u5Vq_OaDAWkSpYGwRPjhmsa3fMzZ6j5TmkCnQBa3r59qGlBg86I-nid7YcS28Hzb7Qs5a_Glx8JdWzbB9KsoZ-U_zj2mmspOhd5ETH7Dt5NBTGpPvB5QV8M35s_IlvtsLDA9z172YyPAGsOaFb9OkjVGVw\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS256-Header.json b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS256-Header.jsondeleted file mode 100644index 5bce20f8d..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS256-Header.json+++ /dev/null@@ -1,4 +0,0 @@-{- "alg": "PS256",- "typ": "JWT"-}\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS256-PrivateKey.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS256-PrivateKey.txtdeleted file mode 100644index de7f532a1..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS256-PrivateKey.txt+++ /dev/null@@ -1,27 +0,0 @@------BEGIN RSA PRIVATE KEY------MIIEpAIBAAKCAQEAwX4iDDoRpA5XY6nFqynqHCrD+Zbl+fhRLck9sD27gWBzu19+-PVcWSyShOJ0F+ItEYkknAQf4bNvBM8GM8cSRB1g8AhnYqt9cmBXq3aEa+PNqodOG-TR3AHsIBraZHs6QbdVeYaB1D6AOLl/VdYxp7sDOF6bdLITaZ8AADIS4pQ4Jls5zb-BTHc76bGYWOFkY4siJvoQ+TJCmDpOiup5cpVKRZan4EoVafLAjlXCYJsporwyalv-EuGdnm2+vKKm6V0i/TIIj19Zwf8Rwv09/utxQWIh4M/J8W4sSufecRkIsq7YgSVJ-V/FYGebzEORHoiYJoRiCz8AbqNH5TXxf+VRCewIDAQABAoIBAA9SUxTfxkTU4+Oe-7mma1JBtbH5Hjidom9kBzfI2OTJJ9nAYZDEsQ7YojOGkQXRIZt5Xh5Cj1m6cSiS0-h1ofpBJOUNYjwM3rCPR8C9CH8NBUyhVNYB2cJPnqh+J9v8DAVnJIwOdBpf5pxXR/-d+kgkDnIIqr6mibjoXXpMlY+xwKy3dHlEQ/dCFLA4GvL1eJiX0bf9RHQwG3hO+PN-KA3+Uf2njXzbSi4i4LoKnfu/ouPh6Ds5I1ylURNi2mONpb3xP4JaaUygsSKBRvPp-2TUzw4fkQ0x4KKUV4TYOYUKSnNAS4vuyhqm7RLdsyCuqpvk1N+bSVjrnGPwnoRWv-VuOgw1kCgYEA7hdblU+MA0uBJOdZ4FG89IYazUuc9MPZiBLuGGu+FyJ1yxczgh+s-oasMxqrGc0pOW3TguHLsz1tZLNeC9wxrM6WwJ+9Ld/5n8Wo8FZHYG3/cvzwLwE57-PFhOedTMahCOtj2LayA7SdycrXni4o0JSeFsbddHmo38bTxOFWyRDuMCgYEA0Av+-boittYq7Y6Hu7JhHVRo+zt1BoEypk6p0/4AyFFfMVZkvbr4UrAubjlqomuRGcZwM-V1RGUDAwuVbaaZy3p0oxKlj+NoD/qNWemJOBWtqdny9pMKtiHQOdGhMeJ/W7DZcq-j5jSRnEcnKLHjE6Y7s7UW4zwYfcDwgTga2fOeYkCgYEArXYhCDgrNt9UmJFhHpgO-hUwKzNUw5famTogUJYChvnMhxLQDl+MBv8tCBJ+485gIXINbkaZRN4VDA/ODe//1-PmyRWZbysdqM2gre+YwHGYnfRwg1O4cyK7Xefs51mzSy9L0EDSkvaNGs6IprrUi5-orT0bVYx2b1mUiNkdCFj0acCgYAL43ORm2vZwOi+Y8WEbZs96LcIGSqj312dW5M9-+nRiJzY8+fj06hXCUxN7igCygTLpURJ/dwhhkq9mF+l5OYRhIeM3WUiFks+JNVPP-wjYVHAL/0rS/HDwKDmfO0qLZg7hBqY68D+6MKfCJnt+qS99/XgBSjvY5kuT7FE5C-tPbeiQKBgQCUrzcbKahyLoGDIcrljiGcwzW9J7tUqfMjQxlYvc+pLgWjdCVfkudl-fpaxhN9g8Wd+bkNboqvke/r/9oHILeimIp60+Q/RkPARHJo9M7EMfS53cDGJgE24-aUuWhvXrkGckfFZBge2JCrFw1NNDX876Dxp0OS8/LGJAHF8/+a4zig==------END RSA PRIVATE KEY-----diff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS256-PublicKey.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS256-PublicKey.txtdeleted file mode 100644index 36b98a816..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS256-PublicKey.txt+++ /dev/null@@ -1,9 +0,0 @@------BEGIN PUBLIC KEY------MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwX4iDDoRpA5XY6nFqynq-HCrD+Zbl+fhRLck9sD27gWBzu19+PVcWSyShOJ0F+ItEYkknAQf4bNvBM8GM8cSR-B1g8AhnYqt9cmBXq3aEa+PNqodOGTR3AHsIBraZHs6QbdVeYaB1D6AOLl/VdYxp7-sDOF6bdLITaZ8AADIS4pQ4Jls5zbBTHc76bGYWOFkY4siJvoQ+TJCmDpOiup5cpV-KRZan4EoVafLAjlXCYJsporwyalvEuGdnm2+vKKm6V0i/TIIj19Zwf8Rwv09/utx-QWIh4M/J8W4sSufecRkIsq7YgSVJV/FYGebzEORHoiYJoRiCz8AbqNH5TXxf+VRC-ewIDAQAB------END PUBLIC KEY-----diff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS256-RsaPrivateKey.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS256-RsaPrivateKey.txtdeleted file mode 100644index f4209d2e7..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS256-RsaPrivateKey.txt+++ /dev/null@@ -1,27 +0,0 @@------BEGIN RSA PRIVATE KEY------MIIEpAIBAAKCAQEA/TeoYuuKAmwxp9qK/x4zZfL9RtJpF+nS1qmfxcKJwMizzslX-ovej95MpUlrFpFdVOMryW3DdvQ2Flk9ZFjk58NaRFFPlwfcMRfxmLxQuMMWswbI4-vI11xb6YIfqqkDd5+ly8lob/n+EvPhL87Ffjm87nVCB//hzHM+CY51ljK7WDCx7P-37MtSMjGVGUfIoZyc5Q4UKMOSFLttHt/cl+/gQx07ZDDCH090BU6v1Ugy8+3fsX7-Gt9Mmy5MxeKdVd85v7zL4ZvhJu8KXfe2+qrpJfJ73Irh4qesNf87ccLrlOFl6FQh-hDf31LCHdH+ankU8URybIfL7DssmJCgrs/p+9wIDA7//AoIBAErz5C3CfGxXKDON-eYi8PTl8TF4/gK0HtSrUue6WgxVzoVoWn1kvx6qVwMx2USK+OWf3o45fT1E201qo-p4T0JoF+9p2IhMMQxaqAPBNru/jdFnJNphO1p70Jj0oIN5KKMLtTY5JJ/CGtevlP-MdmSdE6aFBkwKsTz1owUAT89MK+dSp+UEwPf5rYC+SE5/7ZNctZ/YLb9ajt3g8/0-DH/4n2ZQ8y+p25w4OIwFiFaOgBiBSOqtMm/Y8pk0ahxtXwiUoQ/EdSSkIB0fhvTq-CzsGzfyZCam/dJDbnDtVF4h718t6kO4Pf6lQf9W83XBaF9loLbddjh4LA1/K7j/T-Y3dNwrcCgYEA/tTYonb3WjIyZNg7v/d6qczIQdFw36Qq1QHXgQZD2LCxSwJmHxUa-+Jcm+xqTyjnLM8LYwD7lGpDIfbcmcC24+UwN5OBL8XUXb0MRiZEk0QGAaAxuTPDJ-LosSy5C9GmLXFoKYhJoOCb0GJNsQDn3ODHGF0o0FWRzHMBaxbiBHUJUCgYEA/mDq-sr9wjl4gY+S2ywcSIZHr+dKyNts7O/KuPtDtC4Z+BMSNQf7aG7xXfb/L0ofhRUb4-ML97f+rPXdMx0ICEd+XSHdj+Boe1Bf0in/93ZoBmsNMelh78DwXRBCNOYuQJG0gn-X68CgT7M7iVUq+A5aXEFSiN7JGcbEMk6xS2k8lsCgYEA3wXjGFz/dXeNImBsd49m-kJN5WeMaP7PdBMv1IKvUF4fNllJqWXtrVxpqxdb5qfXwHQr5EAy6OsR4QLTjW9kg-qNqwl3kRsI/asypBU5/qnZLW+dFl0jx8e3deiGS02mnC32ZyE4Kf2mIPRzTfHeX1-oj1kYHbKlihDFkT3iipjFyMCgYEAqsS6GCb0JQ+dUH2GVXj85DZA05iJV6Xm2zP+-xfSdfH/Eqyjibd7sRalLWh9p8ELhfZkOCzkfgp/HEfhtgIHXus4rjNQMPCaRn8DY-8Wn1vhf/5WAiCQjY6Dgfp7NNHFI5sNB5Xa/tgjDRPn8uDgWxA5MuqRmfy7kNsHfn-wEW5IoMCgYAz5z8OtwnDGCNWjhZ6pJKRu0v1r+opiXkdwHEKByLrpwOv2zJJi/yf-RNsMxKaOt9fjonHe7rZ3greWefydw538yspW/L+v93QHRdkbig5XTgTDI1jcHFO8-/kzwRQ0UKkdyJjWAxLeO11HajOge235fxaWa1/Q8YEZdtE8gPNmBAQ==------END RSA PRIVATE KEY-----diff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS256-RsaPublicKey.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS256-RsaPublicKey.txtdeleted file mode 100644index e24581a7c..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS256-RsaPublicKey.txt+++ /dev/null@@ -1,8 +0,0 @@------BEGIN RSA PUBLIC KEY------MIIBCgKCAQEA/TeoYuuKAmwxp9qK/x4zZfL9RtJpF+nS1qmfxcKJwMizzslXovej-95MpUlrFpFdVOMryW3DdvQ2Flk9ZFjk58NaRFFPlwfcMRfxmLxQuMMWswbI4vI11-xb6YIfqqkDd5+ly8lob/n+EvPhL87Ffjm87nVCB//hzHM+CY51ljK7WDCx7P37Mt-SMjGVGUfIoZyc5Q4UKMOSFLttHt/cl+/gQx07ZDDCH090BU6v1Ugy8+3fsX7Gt9M-my5MxeKdVd85v7zL4ZvhJu8KXfe2+qrpJfJ73Irh4qesNf87ccLrlOFl6FQhhDf3-1LCHdH+ankU8URybIfL7DssmJCgrs/p+9wIDA7//------END RSA PUBLIC KEY-----diff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS384-ComplexToken.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS384-ComplexToken.txtdeleted file mode 100644index 0562b1ba2..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS384-ComplexToken.txt+++ /dev/null@@ -1 +0,0 @@-eyJhbGciOiJQUzM4NCIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwidHJ1ZSI6dHJ1ZSwiZmFsc2UiOmZhbHNlLCJsb25nIjoxMjM0NTY3ODkwLCJkZWNpbWFsIjoxMjM0NTY3ODkwLjEyMywib2JqZWN0Ijp7Ik9iamVjdFByb3BlcnR5Ijoib2JqZWN0IHZhbHVlIn0sIm9iamVjdE9mT2JqZWN0Ijp7Im9iamVjdCI6eyJPYmplY3RQcm9wZXJ0eSI6Im9iamVjdCB2YWx1ZSJ9fSwiYXJyYXkiOlsiYXJyYXkgdmFsdWUiXSwiYXJyYXlPZk9iamVjdCI6W3sib2JqZWN0Ijp7Ik9iamVjdFByb3BlcnR5Ijoib2JqZWN0IHZhbHVlIn19XSwibmJmIjoxNjYxMDkyMzcwLCJleHAiOjE2NjEwOTU5NzAsImlhdCI6MTY2MTA5MjM3MCwiaXNzIjoiZGV2dG95cyIsImF1ZCI6ImRldnRveXMifQ.cJLZihnciGWhtn72ejTYvWuA8zv200IgBUw8QTXbsppeIv2HqwE8sKlt7pOjVTvsYMv9pXkN8zlfj-gRpxE5TcPjGbYl2tRb0iPm7CLalxfGLmeywfoXT1xOS4uhni_XGVxU6eQaAjNR5UsIJ_v02irUlaMVNHLenKpGDMKUFwZjz5TQ9NE3CI59tSehlRtiK-MJ1K2Op-yQHsFYIOqi9xQo-vTtadrIEg64IJcingqIljfaz0ESGSLJ2_OODwCjBfiq0X0mlaPdwVIOnqE_6wyS0qR4p6QHuFoG5eWG6WrTG2YfPc4klQ2RGdkGZetboARvFMr-M2PQxhRt3y7u4y8TnmIVDmwKpAC5h53FQCA8Mt6jO0dwSnR-OEXp766hrFIMdrazQvRCeAcbATeqUtPCgWUKuz1eU8UOaVCPLkbk3r2rspGKXgtutbMemqmTsGDtzy9p-Tx_-NS8TGy0I-bc8vcvcgPZ3wDyCeQhBbme5UgqldstZcMBYBaBiufNtRS-V23qJTJfJIarApCSfRv13lufSOwl_n9-aOXmzFRNBjq-kwFt_ZMO6TeZN0PGwxt6Ok_Yr8M70aVhhdOUJEVUcMJaU1XNEvPvIPiDeSVMw142qYe6b-jAeJ5Va4tqqvpChjBI7JR5vwo_xG6JIxlocIJni9RUqgLRsu9DUL0\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS384-Header.json b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS384-Header.jsondeleted file mode 100644index 782072e3e..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS384-Header.json+++ /dev/null@@ -1,4 +0,0 @@-{- "alg": "PS384",- "typ": "JWT"-}\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS384-PrivateKey.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS384-PrivateKey.txtdeleted file mode 100644index 6cc74aeb6..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS384-PrivateKey.txt+++ /dev/null@@ -1,51 +0,0 @@------BEGIN RSA PRIVATE KEY------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------END RSA PRIVATE KEY-----diff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS384-PublicKey.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS384-PublicKey.txtdeleted file mode 100644index 921d29250..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS384-PublicKey.txt+++ /dev/null@@ -1,13 +0,0 @@------BEGIN RSA PUBLIC KEY------MIICCgKCAgEAv+JkirePyexeUtrBQqIP7IYrm9pokdygBIy/othuSzKaiqOFpaAi-MHYqBTGQTyF1JZl8Y1PFemPbD/1P/76yo11Q+VLzot4q0re+JeY4PPzUz+rLlJ4L-uHnQePh/jLMO8oPbdyFVrDZ4sVeyx6Wv2r6FYXty+9LgtDvPBEejSREWrqeAYxy1-WEIWSIqJlQb3MyhomXy4oChARGLEz5mfcGzzebOZytCzfGmzVZSbNgP668HqtocQ-+fgT8G0cWY5eT7NFElXTl0kx2fNRF8W9nHc30ui0IKvL8XHriVyPLw7u+XB9NUJu-8MVm1C2MwT9TO0W/i1lcUpZJqXKOWWvKtZpwEr8j86fnzA3HL0Uy7FuIHW9AwDOK-3TIcNUBJKfTlHESyPRgIiHkvStwuqroZ/9HZL00nPjSrVS5+A8UsU8BVYO5DVLZd-wx6xVe+Yo259E1LHL/m8xU7nWwSrUPQFGVJFjL8TfHHsDbtOFVpQKEKWIuvtRPgH-tC1Q/Zeibz+/eMMRu2MSzbWq9kMuddhwlSmpKlEHYFxWpEJvt6Cak3zkOYgjHsmX-mgNbENFLtn0n/JJuEcNGwMALF64CHVC85AJsDzbfShOn0xopnEUKqD9J+79sGMJm-zDTMp7ki2LJEaoHlCq9rq/BSBvybbKVRQT7n2CHrDJ4Yuq37XImNR5kCAwEAAQ==------END RSA PUBLIC KEY-----diff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS512-ComplexToken.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS512-ComplexToken.txtdeleted file mode 100644index 4955bf5dd..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS512-ComplexToken.txt+++ /dev/null@@ -1 +0,0 @@-eyJhbGciOiJQUzUxMiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwidHJ1ZSI6dHJ1ZSwiZmFsc2UiOmZhbHNlLCJsb25nIjoxMjM0NTY3ODkwLCJkZWNpbWFsIjoxMjM0NTY3ODkwLjEyMywib2JqZWN0Ijp7Ik9iamVjdFByb3BlcnR5Ijoib2JqZWN0IHZhbHVlIn0sIm9iamVjdE9mT2JqZWN0Ijp7Im9iamVjdCI6eyJPYmplY3RQcm9wZXJ0eSI6Im9iamVjdCB2YWx1ZSJ9fSwiYXJyYXkiOlsiYXJyYXkgdmFsdWUiXSwiYXJyYXlPZk9iamVjdCI6W3sib2JqZWN0Ijp7Ik9iamVjdFByb3BlcnR5Ijoib2JqZWN0IHZhbHVlIn19XSwibmJmIjoxNjYxMDkyMzcwLCJleHAiOjE2NjEwOTU5NzAsImlhdCI6MTY2MTA5MjM3MCwiaXNzIjoiZGV2dG95cyIsImF1ZCI6ImRldnRveXMifQ.g2chnq4PLS929mhPUg13z7fneoYLpRWzk5cmWgPHS_EUSN78aJpTDTN81mZ9Ebo1wCrYfpnan1HLvjyoZu9DvLqeWYN0o90EqgxsEoelA-ajozGgCYp_E5lpAJ7Uazhx_g2tKulXbA7zeW_CF4T8yv1jG3GAgy5I9MMw6Jul50BIlV2H4rS3MLh-Wd5rvNt2fkDsxhgs3EhAdd5-R5B8MKov8zAtOLkZedQpPvnPrTYHvoyMS3SAM8V_j1Chbkzqp0k5W8TMpVm2bQFnYfUzp-GAJ7hIQ5plj6sIutLRHsmZT8WuQJeVIXe1cHXw-TZPBWpCnxLVJzCwTyKIEv6D_g_8hYz-KkTZN_wazTtNPAkcgjgapBElFkHlZwvmMMX17VQFghLx4V7xN94v8rDdqPeMnLWOt6BWiPsoJ8E4RjQi4Ec7KjOOhk4TJFFeOYMWqYEw24_HGHcWgc4eLGh0HAgVT2oPUlc-Kxc0_ssfCeEFMmK_kJAOOjgqCPdre_fV\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS512-Header.json b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS512-Header.jsondeleted file mode 100644index 72253e087..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS512-Header.json+++ /dev/null@@ -1,4 +0,0 @@-{- "alg": "PS512",- "typ": "JWT"-}\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS512-PrivateKey.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS512-PrivateKey.txtdeleted file mode 100644index ffdfba88c..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS512-PrivateKey.txt+++ /dev/null@@ -1,40 +0,0 @@------BEGIN PRIVATE KEY------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-mW5VsiqmYW7Gppcv+Cc6KvE=------END PRIVATE KEY-----diff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS512-PublicKey.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS512-PublicKey.txtdeleted file mode 100644index a16e913a8..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/PS/PS512-PublicKey.txt+++ /dev/null@@ -1,11 +0,0 @@------BEGIN PUBLIC KEY------MIIBoDANBgkqhkiG9w0BAQEFAAOCAY0AMIIBiAKCAYEA4O6ELHkB7mbat7FrHxUz-zm3u6DSUV9rmrOq71fZk8KFmmd1gYY4Heic79PxBFOOXXQcRqCv+KRR/CKHkgIjl-qAVCVOxZASAULJo8/rAM78j2AexxBuA79nXM9TflRZOzFoENAf0kZMYDi90Y9jKY-R+vLFNYdKgM/6Z8htTG/kNA0yi+tKwDcGppeGRBz6DxV7acRk3FctrOC2W/athke-tVbZ6S0m0b6NlLQnn1iwmBOUvZmk4daDxy1pXnuELc8Fki8s4ksepWybCkgHlb78-HeW0YF/UgHkkcPiOFfJDM3Eg6l0uu3XaPe6P9Az3rHohCew5C7RJJVAZ4oz+JYh5-atpu8DLYpdhbqHCwLWOwAosu2sqqScP29miTtxeXX6Y6IdABgxVXIQ4rG/exjTPC-4V8nHqG7P9P05vM4bzyhNA5c0ioNLjUP+GSe1r+UtzAPXY2jI719eSHwZNTHgwDY-zNyjcwTB1TXGg+Hp3sMCLjysvkTn0D1L8CzjWApIIQ+DAgED------END PUBLIC KEY-----diff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS256-ComplexToken.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS256-ComplexToken.txtdeleted file mode 100644index 1aa68942a..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS256-ComplexToken.txt+++ /dev/null@@ -1 +0,0 @@-eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwidHJ1ZSI6dHJ1ZSwiZmFsc2UiOmZhbHNlLCJsb25nIjoxMjM0NTY3ODkwLCJkZWNpbWFsIjoxMjM0NTY3ODkwLjEyMywib2JqZWN0Ijp7Ik9iamVjdFByb3BlcnR5Ijoib2JqZWN0IHZhbHVlIn0sIm9iamVjdE9mT2JqZWN0Ijp7Im9iamVjdCI6eyJPYmplY3RQcm9wZXJ0eSI6Im9iamVjdCB2YWx1ZSJ9fSwiYXJyYXkiOlsiYXJyYXkgdmFsdWUiXSwiYXJyYXlPZk9iamVjdCI6W3sib2JqZWN0Ijp7Ik9iamVjdFByb3BlcnR5Ijoib2JqZWN0IHZhbHVlIn19XSwibmJmIjoxNjYxMDkyMzcwLCJleHAiOjE2NjEwOTU5NzAsImlhdCI6MTY2MTA5MjM3MCwiaXNzIjoiZGV2dG95cyIsImF1ZCI6ImRldnRveXMifQ.JudxYaw-Gs9AT8uQQCVFuxLTmgcxbMAWsmVj6VBo-2Q0d7KkwLmyNr325CyGDuo6-zZSOVwyMKFleal6Aea8gdPB81izufag2_cogTYWgzQlNbYlDUUITQqziVvh115XTuFx8rjXAr7YHgDjK5iNhfA-0lnpXkgtYeIvl4ejVJpGA_mOimjxOKSV0pgIDBuW1IufS3clPKCNMX-qVI1WD8_28rUrjP05WWWARfX8TlbMcpIkqA5GiZiis99qt2yfdU9yA-MFQYznpy85f_nd9AW2xsQdaxppAYs5pY63EzWdCIKjCggGZ9W3dkLAVSbTpzf6U3prKsZK5MRFBB-ItA\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS256-EncryptedComplexToken.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS256-EncryptedComplexToken.txtdeleted file mode 100644index 0852952d0..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS256-EncryptedComplexToken.txt+++ /dev/null@@ -1 +0,0 @@-eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwiZmFsc2UiOmZhbHNlLCJpc3MiOiJkZXZ0b3lzIiwiYXJyYXlPZk9iamVjdCI6W3sib2JqZWN0Ijp7Ik9iamVjdFByb3BlcnR5Ijoib2JqZWN0IHZhbHVlIn19XSwibG9uZyI6MTIzNDU2Nzg5MCwiYXVkIjoiZGV2dG95cyIsIm5iZiI6MTY2MTA5MjM3MCwiYXJyYXkiOlsiYXJyYXkgdmFsdWUiXSwib2JqZWN0T2ZPYmplY3QiOnsib2JqZWN0Ijp7Ik9iamVjdFByb3BlcnR5Ijoib2JqZWN0IHZhbHVlIn19LCJuYW1lIjoiSm9obiBEb2UiLCJ0cnVlIjp0cnVlLCJkZWNpbWFsIjoxLjIzNDU2Nzg5MDEyM0U5LCJleHAiOjE2NjEwOTU5NzAsImlhdCI6MTY2MTA5MjM3MCwib2JqZWN0Ijp7Ik9iamVjdFByb3BlcnR5Ijoib2JqZWN0IHZhbHVlIn19.QlK_Qqlt96oQ6ozwnH7FvDIDFbG3O_QOjxv5m2s4cD_lsm433U7L4mZgqgbC7nTtB7R3tEcYBNV64YQfs-6ZaLnEcoOWF2ikIElYRK1-gDiND3XisVD-DfbgvZ01_TgI4Egsv3baWrvjG1n5MIJsd2VWb0Qrr_3EW776CqUwYrNJKDRv8JVBA0C-4THavsXkutOouJfSVk7_3zqChqWzv2kOkfi9M0_IrNm8KE4SfWjuNfxRaHuNFyebAil18CWrAFPPx3ajNCeDJC3-Qpqaa1PaZLS1OK2Jg8xeZVKUMV-ziUr0Y0xcpyRzFEig72w89MpsuRXPCMQineC1EclphA\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS256-EncryptedPrivateKey.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS256-EncryptedPrivateKey.txtdeleted file mode 100644index 1944d0097..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS256-EncryptedPrivateKey.txt+++ /dev/null@@ -1,27 +0,0 @@------BEGIN RSA PRIVATE KEY------MIIEpAIBAAKCAQEA6EGXn+EKSwQaul6wd87KjZ2CniIn9c3ThL631wj63w2zpkP5-FBtJETiY/udTjnFJrNGkfig3osib7i4kv4iwusGKqhRt5mzwrNfPc+XQMe/nd6Ae-PBmhMXiO7JkKBHmN4YAnnd75Fciwtq8WPCKUZF5jGgqJWRdpwXdfYPSCrJ9WoMPn-Z4AwIpvRMmfnuL42efSrc95I1AgiayIO4Vw5f9eU97463AklqLJF6IZYwkyUEFy1-XSbdJXlQNGeMilxgRWUr1MiETHbwB6D+2jbh6ni+DwDRcpzIbNhwlEVRprTy9lwf-LZSyxz6x2XNzbSXB4AVsBw5F+GdYxK9ra/yuKQIDAQABAoIBAGuHYrGsuN0+SzmZ-+U2eufySvhSEb8fHwXQl8GtoRu3aJCCIO9tpPozwjTUG2JKMNLYEYYnfCNMe2cKO-LolWuavdS1uvFaqnKU58pBlefuN/1MR3p0ff/dcvn8w+lnq35E5QzQa0YtIJFned-3Ed/IwDNCkjWM/zBcD8YC1qSGaXdRZfFRK796hCMAc8BBkqeDxqppMWabAoYdmBJ-rHr884aSz4t8I3Bk5ojHMla57NLkZWQ3qeQpjDP0jaD/R/zYhaLpjGcOaO3zadJ+-RoT3+GMM5fifF4iex4Fv4iU5TayHwzvb7AH/7jrbMyo4VgTrWyYSC6AU5So1ZBWN-cioKH+ECgYEA+tN1BptKJBVFUdNpH7ceeig2Zc/XKdkB9vpBOIg2Xvq8Z/xlLCIS-lJnU+8kmYtdl2/gXR3b7Zw76j7EAin1nmFd/XKz3hYhjo1AkT9q1qfPg2TQmPIbv-GZIZvjhop6LRr0RIo88i3TsSBUjUpEpMKznbxh6xUboGrGeQqrtsgbUCgYEA7QwS-wEusrm359LTYOrzbtZBBl7TxUotHO6abCekXJtiuhWaR4eMMmL0TsyHJIAMWtQ1g-3bFbomMZGs+76ULdgdrnc6hxO9BoWRpv5rTdmA3EjTa+B3LsXrdy85Xlt9HcNoUc-+7crlaNQYUKDb97AJDZgk5TDcCRv6IeQHdtnkyUCgYBU6j+lI+9+tcDJCeR9+zWT-L4fzAeEa5r+2iFSKOfsGPqaIIbdysHpP2qBzOU8IiVmPlbbz18EWy8hh2w+O0xO+-TGjuzBPkHh91S41vh2CXD9xgTDphpWDO7FpQvrIXhpSsXFanNlncQcJBDb4HfKu6-upS/xuZK/8qAlXMxidAbPQKBgQDTQvdTOh5kNs+WL7amYrrNTgunUTPiBQ8vMoTq-iDqB/ItNiORrFRec6KYt9+ZwCVCre4jhC7hHOVqecpVehqEzogy1H2ILlOnqv40L-aBY19c8+q5MgwGO45nYkcWuSMA666Fe0XsMRUcPJaqYJhdRoca4Q2Xx07YRvEKJ4-eZoNoQKBgQCvOKbwUXzeqezKfRn1BbnvJYe/xQbONYHgkj47F3JqcqzeOqezJ7AM-6cXnSTAXhi2Chw9CdswVB+nEdAW41xznQkSSclxfhVtiT485b3nXdmk/n1u+TAs9-DGgtJN2RL0hOZzZrbLEtaRSo4E9l+oL1Ke5Ytdb4ossIRWSqzl+XIg==------END RSA PRIVATE KEY-----\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS256-EncryptedPublicKey.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS256-EncryptedPublicKey.txtdeleted file mode 100644index 1944d0097..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS256-EncryptedPublicKey.txt+++ /dev/null@@ -1,27 +0,0 @@------BEGIN RSA PRIVATE KEY------MIIEpAIBAAKCAQEA6EGXn+EKSwQaul6wd87KjZ2CniIn9c3ThL631wj63w2zpkP5-FBtJETiY/udTjnFJrNGkfig3osib7i4kv4iwusGKqhRt5mzwrNfPc+XQMe/nd6Ae-PBmhMXiO7JkKBHmN4YAnnd75Fciwtq8WPCKUZF5jGgqJWRdpwXdfYPSCrJ9WoMPn-Z4AwIpvRMmfnuL42efSrc95I1AgiayIO4Vw5f9eU97463AklqLJF6IZYwkyUEFy1-XSbdJXlQNGeMilxgRWUr1MiETHbwB6D+2jbh6ni+DwDRcpzIbNhwlEVRprTy9lwf-LZSyxz6x2XNzbSXB4AVsBw5F+GdYxK9ra/yuKQIDAQABAoIBAGuHYrGsuN0+SzmZ-+U2eufySvhSEb8fHwXQl8GtoRu3aJCCIO9tpPozwjTUG2JKMNLYEYYnfCNMe2cKO-LolWuavdS1uvFaqnKU58pBlefuN/1MR3p0ff/dcvn8w+lnq35E5QzQa0YtIJFned-3Ed/IwDNCkjWM/zBcD8YC1qSGaXdRZfFRK796hCMAc8BBkqeDxqppMWabAoYdmBJ-rHr884aSz4t8I3Bk5ojHMla57NLkZWQ3qeQpjDP0jaD/R/zYhaLpjGcOaO3zadJ+-RoT3+GMM5fifF4iex4Fv4iU5TayHwzvb7AH/7jrbMyo4VgTrWyYSC6AU5So1ZBWN-cioKH+ECgYEA+tN1BptKJBVFUdNpH7ceeig2Zc/XKdkB9vpBOIg2Xvq8Z/xlLCIS-lJnU+8kmYtdl2/gXR3b7Zw76j7EAin1nmFd/XKz3hYhjo1AkT9q1qfPg2TQmPIbv-GZIZvjhop6LRr0RIo88i3TsSBUjUpEpMKznbxh6xUboGrGeQqrtsgbUCgYEA7QwS-wEusrm359LTYOrzbtZBBl7TxUotHO6abCekXJtiuhWaR4eMMmL0TsyHJIAMWtQ1g-3bFbomMZGs+76ULdgdrnc6hxO9BoWRpv5rTdmA3EjTa+B3LsXrdy85Xlt9HcNoUc-+7crlaNQYUKDb97AJDZgk5TDcCRv6IeQHdtnkyUCgYBU6j+lI+9+tcDJCeR9+zWT-L4fzAeEa5r+2iFSKOfsGPqaIIbdysHpP2qBzOU8IiVmPlbbz18EWy8hh2w+O0xO+-TGjuzBPkHh91S41vh2CXD9xgTDphpWDO7FpQvrIXhpSsXFanNlncQcJBDb4HfKu6-upS/xuZK/8qAlXMxidAbPQKBgQDTQvdTOh5kNs+WL7amYrrNTgunUTPiBQ8vMoTq-iDqB/ItNiORrFRec6KYt9+ZwCVCre4jhC7hHOVqecpVehqEzogy1H2ILlOnqv40L-aBY19c8+q5MgwGO45nYkcWuSMA666Fe0XsMRUcPJaqYJhdRoca4Q2Xx07YRvEKJ4-eZoNoQKBgQCvOKbwUXzeqezKfRn1BbnvJYe/xQbONYHgkj47F3JqcqzeOqezJ7AM-6cXnSTAXhi2Chw9CdswVB+nEdAW41xznQkSSclxfhVtiT485b3nXdmk/n1u+TAs9-DGgtJN2RL0hOZzZrbLEtaRSo4E9l+oL1Ke5Ytdb4ossIRWSqzl+XIg==------END RSA PRIVATE KEY-----\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS256-Header.json b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS256-Header.jsondeleted file mode 100644index 136c3e7d3..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS256-Header.json+++ /dev/null@@ -1,4 +0,0 @@-{- "alg": "RS256",- "typ": "JWT"-}\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS256-PrivateKey.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS256-PrivateKey.txtdeleted file mode 100644index 1944d0097..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS256-PrivateKey.txt+++ /dev/null@@ -1,27 +0,0 @@------BEGIN RSA PRIVATE KEY------MIIEpAIBAAKCAQEA6EGXn+EKSwQaul6wd87KjZ2CniIn9c3ThL631wj63w2zpkP5-FBtJETiY/udTjnFJrNGkfig3osib7i4kv4iwusGKqhRt5mzwrNfPc+XQMe/nd6Ae-PBmhMXiO7JkKBHmN4YAnnd75Fciwtq8WPCKUZF5jGgqJWRdpwXdfYPSCrJ9WoMPn-Z4AwIpvRMmfnuL42efSrc95I1AgiayIO4Vw5f9eU97463AklqLJF6IZYwkyUEFy1-XSbdJXlQNGeMilxgRWUr1MiETHbwB6D+2jbh6ni+DwDRcpzIbNhwlEVRprTy9lwf-LZSyxz6x2XNzbSXB4AVsBw5F+GdYxK9ra/yuKQIDAQABAoIBAGuHYrGsuN0+SzmZ-+U2eufySvhSEb8fHwXQl8GtoRu3aJCCIO9tpPozwjTUG2JKMNLYEYYnfCNMe2cKO-LolWuavdS1uvFaqnKU58pBlefuN/1MR3p0ff/dcvn8w+lnq35E5QzQa0YtIJFned-3Ed/IwDNCkjWM/zBcD8YC1qSGaXdRZfFRK796hCMAc8BBkqeDxqppMWabAoYdmBJ-rHr884aSz4t8I3Bk5ojHMla57NLkZWQ3qeQpjDP0jaD/R/zYhaLpjGcOaO3zadJ+-RoT3+GMM5fifF4iex4Fv4iU5TayHwzvb7AH/7jrbMyo4VgTrWyYSC6AU5So1ZBWN-cioKH+ECgYEA+tN1BptKJBVFUdNpH7ceeig2Zc/XKdkB9vpBOIg2Xvq8Z/xlLCIS-lJnU+8kmYtdl2/gXR3b7Zw76j7EAin1nmFd/XKz3hYhjo1AkT9q1qfPg2TQmPIbv-GZIZvjhop6LRr0RIo88i3TsSBUjUpEpMKznbxh6xUboGrGeQqrtsgbUCgYEA7QwS-wEusrm359LTYOrzbtZBBl7TxUotHO6abCekXJtiuhWaR4eMMmL0TsyHJIAMWtQ1g-3bFbomMZGs+76ULdgdrnc6hxO9BoWRpv5rTdmA3EjTa+B3LsXrdy85Xlt9HcNoUc-+7crlaNQYUKDb97AJDZgk5TDcCRv6IeQHdtnkyUCgYBU6j+lI+9+tcDJCeR9+zWT-L4fzAeEa5r+2iFSKOfsGPqaIIbdysHpP2qBzOU8IiVmPlbbz18EWy8hh2w+O0xO+-TGjuzBPkHh91S41vh2CXD9xgTDphpWDO7FpQvrIXhpSsXFanNlncQcJBDb4HfKu6-upS/xuZK/8qAlXMxidAbPQKBgQDTQvdTOh5kNs+WL7amYrrNTgunUTPiBQ8vMoTq-iDqB/ItNiORrFRec6KYt9+ZwCVCre4jhC7hHOVqecpVehqEzogy1H2ILlOnqv40L-aBY19c8+q5MgwGO45nYkcWuSMA666Fe0XsMRUcPJaqYJhdRoca4Q2Xx07YRvEKJ4-eZoNoQKBgQCvOKbwUXzeqezKfRn1BbnvJYe/xQbONYHgkj47F3JqcqzeOqezJ7AM-6cXnSTAXhi2Chw9CdswVB+nEdAW41xznQkSSclxfhVtiT485b3nXdmk/n1u+TAs9-DGgtJN2RL0hOZzZrbLEtaRSo4E9l+oL1Ke5Ytdb4ossIRWSqzl+XIg==------END RSA PRIVATE KEY-----\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS256-PublicKey.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS256-PublicKey.txtdeleted file mode 100644index 7126789c0..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS256-PublicKey.txt+++ /dev/null@@ -1,9 +0,0 @@------BEGIN PUBLIC KEY------MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu1SU1LfVLPHCozMxH2Mo-4lgOEePzNm0tRgeLezV6ffAt0gunVTLw7onLRnrq0/IzW7yWR7QkrmBL7jTKEn5u-+qKhbwKfBstIs+bMY2Zkp18gnTxKLxoS2tFczGkPLPgizskuemMghRniWaoLcyeh-kd3qqGElvW/VDL5AaWTg0nLVkjRo9z+40RQzuVaE8AkAFmxZzow3x+VJYKdjykkJ-0iT9wCS0DRTXu269V264Vf/3jvredZiKRkgwlL9xNAwxXFg0x/XFw005UWVRIkdg-cKWTjpBP2dPwVZ4WWC+9aGVd+Gyn1o0CLelf4rEjGoXbAAEgAqeGUxrcIlbjXfbc-mwIDAQAB------END PUBLIC KEY-----\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS256-RsaPrivateKey.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS256-RsaPrivateKey.txtdeleted file mode 100644index f4209d2e7..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS256-RsaPrivateKey.txt+++ /dev/null@@ -1,27 +0,0 @@------BEGIN RSA PRIVATE KEY------MIIEpAIBAAKCAQEA/TeoYuuKAmwxp9qK/x4zZfL9RtJpF+nS1qmfxcKJwMizzslX-ovej95MpUlrFpFdVOMryW3DdvQ2Flk9ZFjk58NaRFFPlwfcMRfxmLxQuMMWswbI4-vI11xb6YIfqqkDd5+ly8lob/n+EvPhL87Ffjm87nVCB//hzHM+CY51ljK7WDCx7P-37MtSMjGVGUfIoZyc5Q4UKMOSFLttHt/cl+/gQx07ZDDCH090BU6v1Ugy8+3fsX7-Gt9Mmy5MxeKdVd85v7zL4ZvhJu8KXfe2+qrpJfJ73Irh4qesNf87ccLrlOFl6FQh-hDf31LCHdH+ankU8URybIfL7DssmJCgrs/p+9wIDA7//AoIBAErz5C3CfGxXKDON-eYi8PTl8TF4/gK0HtSrUue6WgxVzoVoWn1kvx6qVwMx2USK+OWf3o45fT1E201qo-p4T0JoF+9p2IhMMQxaqAPBNru/jdFnJNphO1p70Jj0oIN5KKMLtTY5JJ/CGtevlP-MdmSdE6aFBkwKsTz1owUAT89MK+dSp+UEwPf5rYC+SE5/7ZNctZ/YLb9ajt3g8/0-DH/4n2ZQ8y+p25w4OIwFiFaOgBiBSOqtMm/Y8pk0ahxtXwiUoQ/EdSSkIB0fhvTq-CzsGzfyZCam/dJDbnDtVF4h718t6kO4Pf6lQf9W83XBaF9loLbddjh4LA1/K7j/T-Y3dNwrcCgYEA/tTYonb3WjIyZNg7v/d6qczIQdFw36Qq1QHXgQZD2LCxSwJmHxUa-+Jcm+xqTyjnLM8LYwD7lGpDIfbcmcC24+UwN5OBL8XUXb0MRiZEk0QGAaAxuTPDJ-LosSy5C9GmLXFoKYhJoOCb0GJNsQDn3ODHGF0o0FWRzHMBaxbiBHUJUCgYEA/mDq-sr9wjl4gY+S2ywcSIZHr+dKyNts7O/KuPtDtC4Z+BMSNQf7aG7xXfb/L0ofhRUb4-ML97f+rPXdMx0ICEd+XSHdj+Boe1Bf0in/93ZoBmsNMelh78DwXRBCNOYuQJG0gn-X68CgT7M7iVUq+A5aXEFSiN7JGcbEMk6xS2k8lsCgYEA3wXjGFz/dXeNImBsd49m-kJN5WeMaP7PdBMv1IKvUF4fNllJqWXtrVxpqxdb5qfXwHQr5EAy6OsR4QLTjW9kg-qNqwl3kRsI/asypBU5/qnZLW+dFl0jx8e3deiGS02mnC32ZyE4Kf2mIPRzTfHeX1-oj1kYHbKlihDFkT3iipjFyMCgYEAqsS6GCb0JQ+dUH2GVXj85DZA05iJV6Xm2zP+-xfSdfH/Eqyjibd7sRalLWh9p8ELhfZkOCzkfgp/HEfhtgIHXus4rjNQMPCaRn8DY-8Wn1vhf/5WAiCQjY6Dgfp7NNHFI5sNB5Xa/tgjDRPn8uDgWxA5MuqRmfy7kNsHfn-wEW5IoMCgYAz5z8OtwnDGCNWjhZ6pJKRu0v1r+opiXkdwHEKByLrpwOv2zJJi/yf-RNsMxKaOt9fjonHe7rZ3greWefydw538yspW/L+v93QHRdkbig5XTgTDI1jcHFO8-/kzwRQ0UKkdyJjWAxLeO11HajOge235fxaWa1/Q8YEZdtE8gPNmBAQ==------END RSA PRIVATE KEY-----diff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS256-RsaPublicKey.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS256-RsaPublicKey.txtdeleted file mode 100644index e24581a7c..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS256-RsaPublicKey.txt+++ /dev/null@@ -1,8 +0,0 @@------BEGIN RSA PUBLIC KEY------MIIBCgKCAQEA/TeoYuuKAmwxp9qK/x4zZfL9RtJpF+nS1qmfxcKJwMizzslXovej-95MpUlrFpFdVOMryW3DdvQ2Flk9ZFjk58NaRFFPlwfcMRfxmLxQuMMWswbI4vI11-xb6YIfqqkDd5+ly8lob/n+EvPhL87Ffjm87nVCB//hzHM+CY51ljK7WDCx7P37Mt-SMjGVGUfIoZyc5Q4UKMOSFLttHt/cl+/gQx07ZDDCH090BU6v1Ugy8+3fsX7Gt9M-my5MxeKdVd85v7zL4ZvhJu8KXfe2+qrpJfJ73Irh4qesNf87ccLrlOFl6FQhhDf3-1LCHdH+ankU8URybIfL7DssmJCgrs/p+9wIDA7//------END RSA PUBLIC KEY-----diff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS384-ComplexToken.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS384-ComplexToken.txtdeleted file mode 100644index a81ed6613..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS384-ComplexToken.txt+++ /dev/null@@ -1 +0,0 @@-eyJhbGciOiJSUzM4NCIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwidHJ1ZSI6dHJ1ZSwiZmFsc2UiOmZhbHNlLCJsb25nIjoxMjM0NTY3ODkwLCJkZWNpbWFsIjoxMjM0NTY3ODkwLjEyMywib2JqZWN0Ijp7Ik9iamVjdFByb3BlcnR5Ijoib2JqZWN0IHZhbHVlIn0sIm9iamVjdE9mT2JqZWN0Ijp7Im9iamVjdCI6eyJPYmplY3RQcm9wZXJ0eSI6Im9iamVjdCB2YWx1ZSJ9fSwiYXJyYXkiOlsiYXJyYXkgdmFsdWUiXSwiYXJyYXlPZk9iamVjdCI6W3sib2JqZWN0Ijp7Ik9iamVjdFByb3BlcnR5Ijoib2JqZWN0IHZhbHVlIn19XSwibmJmIjoxNjYxMDkyMzcwLCJleHAiOjE2NjEwOTU5NzAsImlhdCI6MTY2MTA5MjM3MCwiaXNzIjoiZGV2dG95cyIsImF1ZCI6ImRldnRveXMifQ.k3RqN4SliXC_bJJXOzu7Hmm15Roz2egMurROlA8rh9v0mrbZJlcPzGLD5CRWDPNILMMVHzwErIRpsd9zP4La0gBB1UC3ne1e3F1tjfAL1NloH0axqlKTcOzLsnNFzvK9BKNAzW1yC4XsF7wo_4ZTG3rPqZs6PUhFj4ILwa_Xrzz5CjDRSIAg0YJD-LP1f48z50cpwkRSJJV85DCVvUhF6tEBUzvfPvwTv0lSLTVH5_q43oj_LrcaOwCTw-7wkbtkoOe_hRnB9A5qsOcj1jjJfbPe8Oqcyel31dVxXU3NC2-zGaRrHRmPIJ8Yc9vKfy1zYOYGPghxrUOYK-dGAkgU7va62yYDqVO1gq1x5nEGQ183dRNO9H9en-6yWw42AxxGrqrkVkoHUgF1chm9yQd0A8ik1MJlogouhygW2hueP5aP6lYWsmz6RmakydTNnqO9V2dMmqL4e1zA6kJI2VLtDQkHYalizvS8uxQdyD0slfVd3oqGgm4KkOVZ4e8zklTo\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS384-Header.json b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS384-Header.jsondeleted file mode 100644index a6675ce60..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS384-Header.json+++ /dev/null@@ -1,4 +0,0 @@-{- "alg": "RS384",- "typ": "JWT"-}\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS384-PrivateKey.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS384-PrivateKey.txtdeleted file mode 100644index 185ba3d39..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS384-PrivateKey.txt+++ /dev/null@@ -1,40 +0,0 @@------BEGIN PRIVATE KEY------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-tfgPajnf3fvYR96hkE5q9nT4------END PRIVATE KEY-----diff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS384-PublicKey.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS384-PublicKey.txtdeleted file mode 100644index 05d85c891..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS384-PublicKey.txt+++ /dev/null@@ -1,11 +0,0 @@------BEGIN PUBLIC KEY------MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAn9DqFHyZcCuslYd3WE30-Lf2MXsEkRcsfmBXV3028PaVXV9pM5ZLa0Cqi5jFYqctI7pNnqtUuyt5LYxhtm7N0-p9UbsXw5WUP5/55gmEjrX6Y28q1xc52azGYjX2x+QmCcFsfZwjPjNEcNnBfJ8xkR-GE1C5xCJzV+gvvuRQVeEJoWMGs6a7X6Pqwk4zESIAgvPGrU3d7xP4bkHngXgQqeV-wiiaw3Ig8rDhF6f0tC59LtmWdwEIb+LIj0Y6SN+8fZAgQq56E2xhm4w2RKa3NttV-Wzap4ZrgDVC6hSPKHXtH/ksMVvet7/s/2DJP134iBKBEXsKyBB9ANC4/eLX6ElBH-lPb6ncqkA1HfMN9v7Okgl8vbhJw5XdNeJ3sQD6lpPXLqJCbuTjkPoem+NW/5nqC8-vMfNbcHZ3wnUyvMOLmRGnIyHWTFjMIYg/PkK7phdbPv7mFwdl2SVHaDZBs/myUsl-TGcYAn1Rf0mrgzBa9QZFHD6vvUoSJz9OVT3outGbqFhdAgMD/78=------END PUBLIC KEY-----diff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS512-ComplexToken.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS512-ComplexToken.txtdeleted file mode 100644index a46edb1b7..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS512-ComplexToken.txt+++ /dev/null@@ -1 +0,0 @@-eyJhbGciOiJSUzUxMiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwidHJ1ZSI6dHJ1ZSwiZmFsc2UiOmZhbHNlLCJsb25nIjoxMjM0NTY3ODkwLCJkZWNpbWFsIjoxMjM0NTY3ODkwLjEyMywib2JqZWN0Ijp7Ik9iamVjdFByb3BlcnR5Ijoib2JqZWN0IHZhbHVlIn0sIm9iamVjdE9mT2JqZWN0Ijp7Im9iamVjdCI6eyJPYmplY3RQcm9wZXJ0eSI6Im9iamVjdCB2YWx1ZSJ9fSwiYXJyYXkiOlsiYXJyYXkgdmFsdWUiXSwiYXJyYXlPZk9iamVjdCI6W3sib2JqZWN0Ijp7Ik9iamVjdFByb3BlcnR5Ijoib2JqZWN0IHZhbHVlIn19XSwibmJmIjoxNjYxMDkyMzcwLCJleHAiOjE2NjEwOTU5NzAsImlhdCI6MTY2MTA5MjM3MCwiaXNzIjoiZGV2dG95cyIsImF1ZCI6ImRldnRveXMifQ.DD4zAoPOezipuM32HC25ZpypTmcrwKsNohOzLGfZcdidrU2Rk7KVldhB899iacBHSZ2kh9PqSzJjTB3q00EmsOC3JS-tT9356Fm1vm_ZaeqJU1I8NLPCmvK6xXO4edND7pnv02MBvzecYl7s_l5sYOy-s8V8zk46gx6_SJEpV5Gf5hELd_c1oXNCH8uxoNZEY_UaYDl9OhvyrYcXbffB9Mv4PDKirHG5HTe27ZK99z6LYyCOb6eOnMJmRpbb1i5bGUaedDQEo_bZuywTb3La04-gQU859QnJbgGcI4XNaZqdwZ5D0Db74c7sbPXRTc6NrIc3XCTcu35JKx-gWpKzZtLmOFIuTS-azUZW_qIx6wA1Vg4UKWNbzUQE506K6p8Z3AtCOVeMmBUn4Q_U1FvEBz9IoLpKEJJjSb7kHxlrLqRcLUXXLOgT27WBXOO6jZGQaGhLwMgT_mNXnvd0RV43oPHoU1QhUO8qnCWcSAEZBH_ohpN9bnuzBx0_CDDT4N6OuRJYIQf6v9v3psk_a9gg1xZmHj3kPlDYg-3PxxhxH3jvY9X6AT3cq5aaCgK54lbhtm5yA3vd3UdCgjctPzW-MbyE8Al-yjo9NlWQisHJ65mT4Is0NuTOI0Ds_cGN8WOxg4Thfl1aWN2dv3dOCxwTf862tIspswIKfyEv5hmaBgQ\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS512-Header.json b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS512-Header.jsondeleted file mode 100644index 7ac2a08ac..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS512-Header.json+++ /dev/null@@ -1,4 +0,0 @@-{- "alg": "RS512",- "typ": "JWT"-}\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS512-PrivateKey.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS512-PrivateKey.txtdeleted file mode 100644index 976a1d85c..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS512-PrivateKey.txt+++ /dev/null@@ -1,52 +0,0 @@------BEGIN PRIVATE KEY------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-MVStA4H4qqjilXSm4ep6NltkqJuxtdZ0------END PRIVATE KEY-----diff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS512-PublicKey.txt b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS512-PublicKey.txtdeleted file mode 100644index 757d99e17..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonWebTokenEncoderDecoder/RS/RS512-PublicKey.txt+++ /dev/null@@ -1,14 +0,0 @@------BEGIN PUBLIC KEY------MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAoAck3yqTOm6JrYIJyex4-daodtK7P5Rv/fAy0FyDh1TQlpu2nZLpzcZegJNKFPbnMAbhcvPAXW4hagp/s+So3-pj5t8kbJdTC5pNBvxAscfhhbFnarz0JxoAcWdztgyQn6RSt5UOxMV73czyEdWR32-HAYEuOsQAKU1hj+0R2kfEVoqh+bJxPrTVeJcxtcsN3DES1rU85sBq9AB4LjcpCb5-0/mbyQFh0Mk470hOMlnB7y9bZjWUsj2FwZqSpAVjdmztNa0bZyrqnI2CvwA+VCW4-xof5MWvMsWTYJi6pX9mKoBC3JElTwOfGdWyOooNhWVA+WxH18eldSZcpLuupitbx-Ry7RLXg/YZEUbmh/GKgTv8kpnOApHpl73wttDXivPpfSh8zUmiWgMSNtGlGW1F7E-SU+jZcPhQ6zU6IRwkY+iiYybs7Riz6C5TYkRuQtery9IjWdLPRYg0sLVWA+FuIdC-BRaU1nEvVMbjolFO4mXNOcRnNuuvnsTtyWloFLAcOMPaZysFcianXnAblsYFzUKE-9jQiOb3uQiY+gW6H+ZGhWBM0CNcsZS8x5wB/Owchw2MAD1Mo0RrU5f4D+Y0P8AA2-SiUur2IQvDCxkhOcRHk0+b8SVS4l4BJ/AahL/W0FZzlwX8Sl2jtdhrn22qzKb5W+-od6w74L4X1xloZP3otAgT70CAwPf/w==------END PUBLIC KEY-----diff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonYamlConverter/FourSpaces.json b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonYamlConverter/FourSpaces.jsondeleted file mode 100644index 5e8bbd019..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonYamlConverter/FourSpaces.json+++ /dev/null@@ -1,6 +0,0 @@-{- "foo": "bar",- "fizz": [- "wizz"- ]-}\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonYamlConverter/FourSpaces.yaml b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonYamlConverter/FourSpaces.yamldeleted file mode 100644index 1e945c7d2..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonYamlConverter/FourSpaces.yaml+++ /dev/null@@ -1,3 +0,0 @@-foo: bar-fizz:- - wizzdiff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonYamlConverter/Invalid.json b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonYamlConverter/Invalid.jsondeleted file mode 100644index 93e11f8c1..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonYamlConverter/Invalid.json+++ /dev/null@@ -1 +0,0 @@- bar { "foo": 123 }\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonYamlConverter/Invalid.yaml b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonYamlConverter/Invalid.yamldeleted file mode 100644index 74f93be2f..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonYamlConverter/Invalid.yaml+++ /dev/null@@ -1 +0,0 @@-'L' is an invalid start of a value. LineNumber: 0 | BytePositionInLine: 0\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonYamlConverter/TwoSpaces.json b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonYamlConverter/TwoSpaces.jsondeleted file mode 100644index f25709124..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonYamlConverter/TwoSpaces.json+++ /dev/null@@ -1,6 +0,0 @@-{- "foo": "bar",- "fizz": [- "wizz"- ]-}\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonYamlConverter/TwoSpaces.yaml b/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonYamlConverter/TwoSpaces.yamldeleted file mode 100644index b462c38e9..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/JsonYamlConverter/TwoSpaces.yaml+++ /dev/null@@ -1,3 +0,0 @@-foo: bar-fizz:- - wizzdiff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/XMLTester/InvalidXml.xml b/src/app/tests/DevToys.UnitTests/Tools/TestData/XMLTester/InvalidXml.xmldeleted file mode 100644index f6ded868a..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/XMLTester/InvalidXml.xml+++ /dev/null@@ -1,22 +0,0 @@-<?xml version="1.0" encoding="utf-8" ?>-<bookstore xmlns="http://www.contoso.com/books">- <book genre="autobiography" publicationdate="1981-03-22" ISBN="1-861003-11-0">- <title>The Autobiography of Benjamin Franklin</title>- <author>- <first-name>Benjamin</first-name>- <last-name>Franklin</last-name>- </author>- <price>8.99</price>- </book>-- I am an invalid XML file!!!!!!!!!!!-- <book genre="novel" publicationdate="1967-11-17" ISBN="0-201-63361-2"/>/- <book genre="philosophy" publicationdate="1991-02-15" ISBN="1-861001-57-6">- <title>The Gorgias</title>- <author>- <name>Plato</name>- </author>- <price>9.99</price>- </book>-</bookstore>\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/XMLTester/InvalidXsd.xml b/src/app/tests/DevToys.UnitTests/Tools/TestData/XMLTester/InvalidXsd.xmldeleted file mode 100644index 1acddcf94..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/XMLTester/InvalidXsd.xml+++ /dev/null@@ -1,32 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<!--<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://www.contoso.com/books" xmlns:xs="http://www.w3.org/2001/XMLSchema">-->-- THIS BEAUTIFUL XSD FILE SHOULD NOT COMPILE!!!!!!!!!!!!-- <xs:element name="bookstore">- <xs:complexType>- <xs:sequence>- <xs:element maxOccurs="unbounded" name="book">- <xs:complexType>- <xs:sequence>- <xs:element name="title" type="xs:string" />- <xs:element name="author">- <xs:complexType>- <xs:sequence>- <xs:element minOccurs="0" name="name" type="xs:string" />- <xs:element minOccurs="0" name="first-name" type="xs:string" />- <xs:element minOccurs="0" name="last-name" type="xs:string" />- </xs:sequence>- </xs:complexType>- </xs:element>- <xs:element name="price" type="xs:decimal" />- </xs:sequence>- <xs:attribute name="genre" type="xs:string" use="required" />- <xs:attribute name="publicationdate" type="xs:date" use="required" />- <xs:attribute name="ISBN" type="xs:string" use="required" />- </xs:complexType>- </xs:element>- </xs:sequence>- </xs:complexType>- </xs:element>-</xs:schema>\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/XMLTester/ValidXml.xml b/src/app/tests/DevToys.UnitTests/Tools/TestData/XMLTester/ValidXml.xmldeleted file mode 100644index c33dd4dec..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/XMLTester/ValidXml.xml+++ /dev/null@@ -1,26 +0,0 @@-<?xml version="1.0" encoding="utf-8" ?>-<bookstore xmlns="http://www.contoso.com/books">- <book genre="autobiography" publicationdate="1981-03-22" ISBN="1-861003-11-0">- <title>The Autobiography of Benjamin Franklin</title>- <author>- <first-name>Benjamin</first-name>- <last-name>Franklin</last-name>- </author>- <price>8.99</price>- </book>- <book genre="novel" publicationdate="1967-11-17" ISBN="0-201-63361-2">- <title>The Confidence Man</title>- <author>- <first-name>Herman</first-name>- <last-name>Melville</last-name>- </author>- <price>11.99</price>- </book>- <book genre="philosophy" publicationdate="1991-02-15" ISBN="1-861001-57-6">- <title>The Gorgias</title>- <author>- <name>Plato</name>- </author>- <price>9.99</price>- </book>-</bookstore>\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/XMLTester/ValidXmlWithNamespace.xml b/src/app/tests/DevToys.UnitTests/Tools/TestData/XMLTester/ValidXmlWithNamespace.xmldeleted file mode 100644index b6462fdd9..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/XMLTester/ValidXmlWithNamespace.xml+++ /dev/null@@ -1,7 +0,0 @@-<?xml version="1.0"?>-<note xmlns="https://www.w3schools.com">- <to>Tove</to>- <from>Jani</from>- <heading>Reminder</heading>- <body>Don't forget me this weekend!</body>-</note>\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/XMLTester/ValidXmlWithoutNamespace.xml b/src/app/tests/DevToys.UnitTests/Tools/TestData/XMLTester/ValidXmlWithoutNamespace.xmldeleted file mode 100644index e6b3ff6a5..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/XMLTester/ValidXmlWithoutNamespace.xml+++ /dev/null@@ -1,7 +0,0 @@-<?xml version="1.0"?>-<note>- <to>Tove</to>- <from>Jani</from>- <heading>Reminder</heading>- <body>Don't forget me this weekend!</body>-</note>\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/XMLTester/ValidXsd.xml b/src/app/tests/DevToys.UnitTests/Tools/TestData/XMLTester/ValidXsd.xmldeleted file mode 100644index d9ecaf7ef..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/XMLTester/ValidXsd.xml+++ /dev/null@@ -1,29 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://www.contoso.com/books" xmlns:xs="http://www.w3.org/2001/XMLSchema">- <xs:element name="bookstore">- <xs:complexType>- <xs:sequence>- <xs:element maxOccurs="unbounded" name="book">- <xs:complexType>- <xs:sequence>- <xs:element name="title" type="xs:string" />- <xs:element name="author">- <xs:complexType>- <xs:sequence>- <xs:element minOccurs="0" name="name" type="xs:string" />- <xs:element minOccurs="0" name="first-name" type="xs:string" />- <xs:element minOccurs="0" name="last-name" type="xs:string" />- </xs:sequence>- </xs:complexType>- </xs:element>- <xs:element name="price" type="xs:decimal" />- </xs:sequence>- <xs:attribute name="genre" type="xs:string" use="required" />- <xs:attribute name="publicationdate" type="xs:date" use="required" />- <xs:attribute name="ISBN" type="xs:string" use="required" />- </xs:complexType>- </xs:element>- </xs:sequence>- </xs:complexType>- </xs:element>-</xs:schema>\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/XMLTester/ValidXsdOnlyWithTargetNamespace.xml b/src/app/tests/DevToys.UnitTests/Tools/TestData/XMLTester/ValidXsdOnlyWithTargetNamespace.xmldeleted file mode 100644index 30e05557f..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/XMLTester/ValidXsdOnlyWithTargetNamespace.xml+++ /dev/null@@ -1,15 +0,0 @@-<?xml version="1.0"?>-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"-targetNamespace="https://www.w3schools.com"-elementFormDefault="qualified">- <xs:element name="note">- <xs:complexType>- <xs:sequence>- <xs:element name="to" type="xs:string"/>- <xs:element name="from" type="xs:string"/>- <xs:element name="heading" type="xs:string"/>- <xs:element name="body" type="xs:string"/>- </xs:sequence>- </xs:complexType>- </xs:element>-</xs:schema>\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/XMLTester/ValidXsdWithNamespace.xml b/src/app/tests/DevToys.UnitTests/Tools/TestData/XMLTester/ValidXsdWithNamespace.xmldeleted file mode 100644index 33a941876..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/XMLTester/ValidXsdWithNamespace.xml+++ /dev/null@@ -1,16 +0,0 @@-<?xml version="1.0"?>-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"-targetNamespace="https://www.w3schools.com"-xmlns="https://www.w3schools.com"-elementFormDefault="qualified">- <xs:element name="note">- <xs:complexType>- <xs:sequence>- <xs:element name="to" type="xs:string"/>- <xs:element name="from" type="xs:string"/>- <xs:element name="heading" type="xs:string"/>- <xs:element name="body" type="xs:string"/>- </xs:sequence>- </xs:complexType>- </xs:element>-</xs:schema>\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/XMLTester/ValidXsdWithoutNamespace.xml b/src/app/tests/DevToys.UnitTests/Tools/TestData/XMLTester/ValidXsdWithoutNamespace.xmldeleted file mode 100644index f8a4d0598..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/XMLTester/ValidXsdWithoutNamespace.xml+++ /dev/null@@ -1,13 +0,0 @@-<?xml version="1.0"?>-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">- <xs:element name="note">- <xs:complexType>- <xs:sequence>- <xs:element name="to" type="xs:string"/>- <xs:element name="from" type="xs:string"/>- <xs:element name="heading" type="xs:string"/>- <xs:element name="body" type="xs:string"/>- </xs:sequence>- </xs:complexType>- </xs:element>-</xs:schema>\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/XmlFormatter/FourSpaces.xml b/src/app/tests/DevToys.UnitTests/Tools/TestData/XmlFormatter/FourSpaces.xmldeleted file mode 100644index 151a81f91..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/XmlFormatter/FourSpaces.xml+++ /dev/null@@ -1,26 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<bookstore xmlns="http://www.contoso.com/books">- <book genre="autobiography" publicationdate="1981-03-22" ISBN="1-861003-11-0">- <title>The Autobiography of Benjamin Franklin</title>- <author>- <first-name>Benjamin</first-name>- <last-name>Franklin</last-name>- </author>- <price>8.99</price>- </book>- <book genre="novel" publicationdate="1967-11-17" ISBN="0-201-63361-2">- <title>The Confidence Man</title>- <author>- <first-name>Herman</first-name>- <last-name>Melville</last-name>- </author>- <price>11.99</price>- </book>- <book genre="philosophy" publicationdate="1991-02-15" ISBN="1-861001-57-6">- <title>The Gorgias</title>- <author>- <name>Plato</name>- </author>- <price>9.99</price>- </book>-</bookstore>\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/XmlFormatter/Minified.xml b/src/app/tests/DevToys.UnitTests/Tools/TestData/XmlFormatter/Minified.xmldeleted file mode 100644index cb2e95959..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/XmlFormatter/Minified.xml+++ /dev/null@@ -1 +0,0 @@-<?xml version="1.0" encoding="utf-8"?><bookstore xmlns="http://www.contoso.com/books"><book genre="autobiography" publicationdate="1981-03-22" ISBN="1-861003-11-0"><title>The Autobiography of Benjamin Franklin</title><author><first-name>Benjamin</first-name><last-name>Franklin</last-name></author><price>8.99</price></book><book genre="novel" publicationdate="1967-11-17" ISBN="0-201-63361-2"><title>The Confidence Man</title><author><first-name>Herman</first-name><last-name>Melville</last-name></author><price>11.99</price></book><book genre="philosophy" publicationdate="1991-02-15" ISBN="1-861001-57-6"><title>The Gorgias</title><author><name>Plato</name></author><price>9.99</price></book></bookstore>\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/XmlFormatter/NewLineOnAttributes.xml b/src/app/tests/DevToys.UnitTests/Tools/TestData/XmlFormatter/NewLineOnAttributes.xmldeleted file mode 100644index b2f91fe7b..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/XmlFormatter/NewLineOnAttributes.xml+++ /dev/null@@ -1,36 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<bookstore- xmlns="http://www.contoso.com/books">- <book- genre="autobiography"- publicationdate="1981-03-22"- ISBN="1-861003-11-0">- <title>The Autobiography of Benjamin Franklin</title>- <author>- <first-name>Benjamin</first-name>- <last-name>Franklin</last-name>- </author>- <price>8.99</price>- </book>- <book- genre="novel"- publicationdate="1967-11-17"- ISBN="0-201-63361-2">- <title>The Confidence Man</title>- <author>- <first-name>Herman</first-name>- <last-name>Melville</last-name>- </author>- <price>11.99</price>- </book>- <book- genre="philosophy"- publicationdate="1991-02-15"- ISBN="1-861001-57-6">- <title>The Gorgias</title>- <author>- <name>Plato</name>- </author>- <price>9.99</price>- </book>-</bookstore>\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/XmlFormatter/OneTab.xml b/src/app/tests/DevToys.UnitTests/Tools/TestData/XmlFormatter/OneTab.xmldeleted file mode 100644index 16650000c..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/XmlFormatter/OneTab.xml+++ /dev/null@@ -1,26 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<bookstore xmlns="http://www.contoso.com/books">- <book genre="autobiography" publicationdate="1981-03-22" ISBN="1-861003-11-0">- <title>The Autobiography of Benjamin Franklin</title>- <author>- <first-name>Benjamin</first-name>- <last-name>Franklin</last-name>- </author>- <price>8.99</price>- </book>- <book genre="novel" publicationdate="1967-11-17" ISBN="0-201-63361-2">- <title>The Confidence Man</title>- <author>- <first-name>Herman</first-name>- <last-name>Melville</last-name>- </author>- <price>11.99</price>- </book>- <book genre="philosophy" publicationdate="1991-02-15" ISBN="1-861001-57-6">- <title>The Gorgias</title>- <author>- <name>Plato</name>- </author>- <price>9.99</price>- </book>-</bookstore>\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/XmlFormatter/TwoSpaces.xml b/src/app/tests/DevToys.UnitTests/Tools/TestData/XmlFormatter/TwoSpaces.xmldeleted file mode 100644index b4bf0e58b..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/XmlFormatter/TwoSpaces.xml+++ /dev/null@@ -1,26 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<bookstore xmlns="http://www.contoso.com/books">- <book genre="autobiography" publicationdate="1981-03-22" ISBN="1-861003-11-0">- <title>The Autobiography of Benjamin Franklin</title>- <author>- <first-name>Benjamin</first-name>- <last-name>Franklin</last-name>- </author>- <price>8.99</price>- </book>- <book genre="novel" publicationdate="1967-11-17" ISBN="0-201-63361-2">- <title>The Confidence Man</title>- <author>- <first-name>Herman</first-name>- <last-name>Melville</last-name>- </author>- <price>11.99</price>- </book>- <book genre="philosophy" publicationdate="1991-02-15" ISBN="1-861001-57-6">- <title>The Gorgias</title>- <author>- <name>Plato</name>- </author>- <price>9.99</price>- </book>-</bookstore>\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/TestData/XmlFormatter/ValidXml.xml b/src/app/tests/DevToys.UnitTests/Tools/TestData/XmlFormatter/ValidXml.xmldeleted file mode 100644index c33dd4dec..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/TestData/XmlFormatter/ValidXml.xml+++ /dev/null@@ -1,26 +0,0 @@-<?xml version="1.0" encoding="utf-8" ?>-<bookstore xmlns="http://www.contoso.com/books">- <book genre="autobiography" publicationdate="1981-03-22" ISBN="1-861003-11-0">- <title>The Autobiography of Benjamin Franklin</title>- <author>- <first-name>Benjamin</first-name>- <last-name>Franklin</last-name>- </author>- <price>8.99</price>- </book>- <book genre="novel" publicationdate="1967-11-17" ISBN="0-201-63361-2">- <title>The Confidence Man</title>- <author>- <first-name>Herman</first-name>- <last-name>Melville</last-name>- </author>- <price>11.99</price>- </book>- <book genre="philosophy" publicationdate="1991-02-15" ISBN="1-861001-57-6">- <title>The Gorgias</title>- <author>- <name>Plato</name>- </author>- <price>9.99</price>- </book>-</bookstore>\ No newline at end of filediff --git a/src/app/tests/DevToys.UnitTests/Tools/Testers/JsonPathTester/JsonPathTesterCommandLineToolTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Testers/JsonPathTester/JsonPathTesterCommandLineToolTests.csdeleted file mode 100644index f2c14d899..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Testers/JsonPathTester/JsonPathTesterCommandLineToolTests.cs+++ /dev/null@@ -1,53 +0,0 @@-using System.IO;-using System.Threading;-using System.Threading.Tasks;-using DevToys.CLI;-using DevToys.Tools.Tools.Testers.JsonPathTester;--namespace DevToys.UnitTests.Tools.Testers.JsonPathTester;--public sealed class JsonPathTesterCommandLineToolTests : MefBasedTest-{- private readonly JsonPathTesterCommandLineTool _tool;-- public JsonPathTesterCommandLineToolTests()- : base(typeof(JsonPathTesterCommandLineTool).Assembly)- {- _tool = (JsonPathTesterCommandLineTool)MefProvider.ImportMany<ICommandLineTool, CommandLineToolMetadata>()- .Single(t => t.Metadata.InternalComponentName == "JSONPathTester")- .Value;- }-- [Fact]- public async Task TestJsonPathUi()- {- string inputJson = await TestDataProvider.GetEmbeddedFileContent("DevToys.UnitTests.Tools.TestData.JsonPathTester.sample.json");-- _tool.InputJson = inputJson;- _tool.InputJsonPath = "$.phoneNumbers[:1].type";-- using var consoleOutput = new ConsoleOutputMonitor();- await _tool.InvokeAsync(new MockILogger(), CancellationToken.None);-- string result = consoleOutput.GetOutput().Trim();- result.Should().Be(- @"[- ""iPhone""-]");- }-- [Fact]- public async Task TestJsonPathUiFailed()- {- string inputJson = await TestDataProvider.GetEmbeddedFileContent("DevToys.UnitTests.Tools.TestData.JsonPathTester.sample.json");-- _tool.InputJson = inputJson;- _tool.InputJsonPath = "$.TEST";-- using var consoleOutput = new ConsoleOutputMonitor();- await _tool.InvokeAsync(new MockILogger(), CancellationToken.None);-- string result = consoleOutput.GetOutput().Trim();- result.Should().Be("[]");- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Testers/JsonPathTester/JsonPathTesterGuiToolTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Testers/JsonPathTester/JsonPathTesterGuiToolTests.csdeleted file mode 100644index 3b6b39c4c..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Testers/JsonPathTester/JsonPathTesterGuiToolTests.cs+++ /dev/null@@ -1,57 +0,0 @@-using System.IO;-using System.Threading.Tasks;-using DevToys.Core.Tools.Metadata;-using DevToys.Tools.Tools.Testers.JsonPathTester;--namespace DevToys.UnitTests.Tools.Testers.JsonPathTester;--public sealed class JsonPathTesterGuiToolTests : MefBasedTest-{- private readonly JsonPathTesterGuiTool _tool;- private readonly UIToolView _toolView;- private readonly IUIMultiLineTextInput _inputBox;- private readonly IUISingleLineTextInput _jsonPathInputBox;- private readonly IUIMultiLineTextInput _outputBox;- private readonly string _baseTestDataDirectory = Path.Combine("Tools", "TestData", nameof(JsonPathTester));-- public JsonPathTesterGuiToolTests()- : base(typeof(JsonPathTesterGuiTool).Assembly)- {- _tool = (JsonPathTesterGuiTool)MefProvider.ImportMany<IGuiTool, GuiToolMetadata>()- .Single(t => t.Metadata.InternalComponentName == "JSONPathTester")- .Value;-- _toolView = _tool.View;-- _inputBox = (IUIMultiLineTextInput)_toolView.GetChildElementById("input-json-json-path-tester");- _jsonPathInputBox = (IUISingleLineTextInput)_toolView.GetChildElementById("input-json-path-json-path-tester");- _outputBox = (IUIMultiLineTextInput)_toolView.GetChildElementById("output-json-path-tester");- }-- [Fact]- public async Task TestJsonPathUi()- {- string inputJson = await TestDataProvider.GetEmbeddedFileContent("DevToys.UnitTests.Tools.TestData.JsonPathTester.sample.json");-- _inputBox.Text(inputJson);- _jsonPathInputBox.Text("$.phoneNumbers[:1].type");- await _tool.WorkTask;-- _outputBox.Text.Should().Be(- @"[- ""iPhone""-]");- }-- [Fact]- public async Task TestJsonPathUiFailed()- {- string inputJson = await TestDataProvider.GetEmbeddedFileContent("DevToys.UnitTests.Tools.TestData.JsonPathTester.sample.json");-- _inputBox.Text(inputJson);- _jsonPathInputBox.Text("$.TEST");- await _tool.WorkTask;-- _outputBox.Text.Should().Be("[]");- }-}diff --git a/src/app/tests/DevToys.UnitTests/Tools/Text/EscapeUnescape/EscapeUnescapeGuiToolTests.cs b/src/app/tests/DevToys.UnitTests/Tools/Text/EscapeUnescape/EscapeUnescapeGuiToolTests.csdeleted file mode 100644index 799c0944f..000000000--- a/src/app/tests/DevToys.UnitTests/Tools/Text/EscapeUnescape/EscapeUnescapeGuiToolTests.cs+++ /dev/null@@ -1,50 +0,0 @@-using System.Threading.Tasks;-using DevToys.Core.Tools.Metadata;-using DevToys.Tools.Tools.Text.EscapeUnescape;--namespace DevToys.UnitTests.Tools.EncodersDecoders.Base64Text;--public sealed class EscapeUnescapeGuiToolTests : MefBasedTest-{- private readonly EscapeUnescapeGuiTool _tool;- private readonly UIToolView _toolView;- private readonly IUIMultiLineTextInput _inputBox;- private readonly IUIMultiLineTextInput _outputBox;-- public EscapeUnescapeGuiToolTests()- : base(typeof(EscapeUnescapeGuiTool).Assembly)- {- _tool = (EscapeUnescapeGuiTool)MefProvider.ImportMany<IGuiTool, GuiToolMetadata>()- .Single(t => t.Metadata.InternalComponentName == "EscapeUnescape")- .Value;-- _toolView = _tool.View;-- _inputBox = (IUIMultiLineTextInput)_toolView.GetChildElementById("text-escape-unescape-input-box");- _outputBox = (IUIMultiLineTextInput)_toolView.GetChildElementById("text-escape-unescape-output-box");- }-- [Fact]- public async Task SwitchConversionMode()- {- var conversionMode = (IUISwitch)_toolView.GetChildElementById("text-escape-unescape-conversion-mode-switch");-- _inputBox.Text("hello\rworld");- await _tool.WorkTask;- _outputBox.Text.Should().Be("hello\\rworld");-- conversionMode.Off(); // Switch to Unescape-- await _tool.WorkTask;- _inputBox.Text.Should().Be("hello\\rworld");- await _tool.WorkTask;- _outputBox.Text("hello\rworld");-- conversionMode.On(); // Switch to Escape- await _tool.WorkTask;-- _inputBox.Text("hello\rworld\r");- await _tool.WorkTask;- _outputBox.Text.Should().Be("hello\\rworld\\r");- }-}diff --git a/src/generators/ResxHelperGenerator/CultureHelperGenerator.cs b/src/generators/ResxHelperGenerator/CultureHelperGenerator.csindex 8b7f4be41..4f5dd764f 100644--- a/src/generators/ResxHelperGenerator/CultureHelperGenerator.cs+++ b/src/generators/ResxHelperGenerator/CultureHelperGenerator.cs@@ -31,7 +31,7 @@ public class CultureHelperGenerator : ISourceGeneratorif (InitialCheckUp(context, out string projectRootPath, out string projectRootNamespace)){- string[] cultures = DetectAllCutlures(context);+ string[] cultures = DetectAllCultures(context);if (!context.CancellationToken.IsCancellationRequested){@@ -79,7 +79,7 @@ public class CultureHelperGenerator : ISourceGeneratorreturn true;}- private string[] DetectAllCutlures(GeneratorExecutionContext context)+ private string[] DetectAllCultures(GeneratorExecutionContext context){var cultures = new HashSet<string>() { "en-US" };