A Swiss Army knife for developers.
C# blazorcross-platformcsharpdesktopdesktop-appdesktop-applicationdeveloper-toolsextensiblefluentfluent-designlinuxmacosmicasyntax-highlightingtypescriptwindowswindows-10windows-11winui
Fixed merge conflict
Etienne Baudoux6a4fc20b0ef9
diff --git a/src/app/dev/DevToys.Tools/DevToys.Tools.csproj b/src/app/dev/DevToys.Tools/DevToys.Tools.csprojindex 91466277b..ddbe8acf2 100644--- a/src/app/dev/DevToys.Tools/DevToys.Tools.csproj+++ b/src/app/dev/DevToys.Tools/DevToys.Tools.csproj@@ -29,6 +29,11 @@--></ItemGroup><ItemGroup>+ <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>@@ -46,6 +51,10 @@</Compile></ItemGroup><ItemGroup>+ <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>diff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Text/Base64TextEncoderDecoderCommandLineTool.cs b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Text/Base64TextEncoderDecoderCommandLineTool.csindex 41a4beb1e..acd814ea0 100644--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Text/Base64TextEncoderDecoderCommandLineTool.cs+++ b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Text/Base64TextEncoderDecoderCommandLineTool.cs@@ -24,7 +24,7 @@ internal sealed class Base64TextEncoderDecoderCommandLineTool : ICommandLineToolName = "conversion",Alias = "c",DescriptionResourceName = nameof(Base64TextEncoderDecoder.ConversionOptionDescription))]- private EncodingConversion ConversionMode { get; set; } = EncodingConversion.Encode;+ private EncodingConversion EncodingConversionMode { get; set; } = EncodingConversion.Encode;[CommandLineOption(Name = "encoding",@@ -35,7 +35,7 @@ internal sealed class Base64TextEncoderDecoderCommandLineTool : ICommandLineToolpublic ValueTask<int> InvokeAsync(ILogger logger, CancellationToken cancellationToken){string output;- switch (ConversionMode)+ switch (EncodingConversionMode){case EncodingConversion.Encode:output = Base64Helper.FromTextToBase64(Input, EncodingMode, logger, cancellationToken);diff --git a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Text/Base64TextEncoderDecoderGuiTool.cs b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Text/Base64TextEncoderDecoderGuiTool.csindex f81125c7f..03ae99d79 100644--- a/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Text/Base64TextEncoderDecoderGuiTool.cs+++ b/src/app/dev/DevToys.Tools/Tools/EncodersDecoders/Base64Text/Base64TextEncoderDecoderGuiTool.cs@@ -82,6 +82,9 @@ internal sealed partial class Base64TextEncoderDecoderGuiTool : IGuiTool, IDispo}}+ // For unit tests.+ internal Task? WorkTask { get; private set; }+public UIToolView View=> new(isScrollable: true,@@ -201,7 +204,7 @@ internal sealed partial class Base64TextEncoderDecoderGuiTool : IGuiTool, IDispo_cancellationTokenSource?.Dispose();_cancellationTokenSource = new CancellationTokenSource();- ConvertAsync(text, _cancellationTokenSource.Token).ForgetSafely();+ WorkTask = ConvertAsync(text, _cancellationTokenSource.Token);}private async Task ConvertAsync(string input, CancellationToken cancellationToken)