diff --git a/Clients/CirrusCiClient/CirrusCiClient.csproj b/Clients/CirrusCiClient/CirrusCiClient.csproj index 34b99db7..83904cec 100644 --- a/Clients/CirrusCiClient/CirrusCiClient.csproj +++ b/Clients/CirrusCiClient/CirrusCiClient.csproj @@ -11,6 +11,6 @@ - + \ No newline at end of file diff --git a/Clients/CompatApiClient/CompatApiClient.csproj b/Clients/CompatApiClient/CompatApiClient.csproj index d5d8c4b7..50d5e0da 100644 --- a/Clients/CompatApiClient/CompatApiClient.csproj +++ b/Clients/CompatApiClient/CompatApiClient.csproj @@ -17,7 +17,7 @@ - + diff --git a/Clients/IrdLibraryClient/IrdLibraryClient.csproj b/Clients/IrdLibraryClient/IrdLibraryClient.csproj index d332374b..acc5084c 100644 --- a/Clients/IrdLibraryClient/IrdLibraryClient.csproj +++ b/Clients/IrdLibraryClient/IrdLibraryClient.csproj @@ -7,7 +7,7 @@ - + diff --git a/CompatBot/Commands/Vision.cs b/CompatBot/Commands/Vision.cs index 1546c9f0..7f2a97b7 100644 --- a/CompatBot/Commands/Vision.cs +++ b/CompatBot/Commands/Vision.cs @@ -109,9 +109,7 @@ internal sealed class Vision: BaseCommandModuleCustom await using (var stream = await httpClient.GetStreamAsync(imageUrl).ConfigureAwait(false)) await stream.CopyToAsync(imageStream).ConfigureAwait(false); imageStream.Seek(0, SeekOrigin.Begin); -#pragma warning disable VSTHRD103 - using var img = Image.Load(imageStream, out var imgFormat); -#pragma warning restore VSTHRD103 + using var img = await Image.LoadAsync(imageStream).ConfigureAwait(false); imageStream.Seek(0, SeekOrigin.Begin); //resize and shrink file size to get under azure limits @@ -123,7 +121,7 @@ internal sealed class Vision: BaseCommandModuleCustom resized = true; } img.Mutate(i => i.AutoOrient()); - if (resized || imgFormat.Name != JpegFormat.Instance.Name) + if (resized || img.Metadata.DecodedImageFormat?.Name != JpegFormat.Instance.Name) { imageStream.SetLength(0); await img.SaveAsync(imageStream, new JpegEncoder {Quality = 90}).ConfigureAwait(false); @@ -236,7 +234,7 @@ internal sealed class Vision: BaseCommandModuleCustom var complementaryColor = complementaryPalette[i % complementaryPalette.Count]; var textOptions = new TextOptions(font) { - KerningMode = KerningMode.Normal, + KerningMode = KerningMode.Standard, #if LABELS_INSIDE WrapTextWidth = r.W - 10, #endif @@ -244,7 +242,7 @@ internal sealed class Vision: BaseCommandModuleCustom var textDrawingOptions = new DrawingOptions {GraphicsOptions = fgGop/*, TextOptions = textOptions*/}; //var brush = Brushes.Solid(Color.Black); //var pen = Pens.Solid(color, 2); - var textBox = TextMeasurer.Measure(label, textOptions); + var textBox = TextMeasurer.MeasureBounds(label, textOptions); #if LABELS_INSIDE var textHeightScale = (int)Math.Ceiling(textBox.Width / Math.Min(img.Width - r.X - 10 - 4 * scale, r.W - 4 * scale)); #endif diff --git a/CompatBot/CompatBot.csproj b/CompatBot/CompatBot.csproj index 70aa72ec..9f95c26c 100644 --- a/CompatBot/CompatBot.csproj +++ b/CompatBot/CompatBot.csproj @@ -43,31 +43,31 @@ - + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - + - - + + - - + + diff --git a/SourceGenerators/SourceGenerators.csproj b/SourceGenerators/SourceGenerators.csproj index 0adb22e1..76044ff8 100644 --- a/SourceGenerators/SourceGenerators.csproj +++ b/SourceGenerators/SourceGenerators.csproj @@ -7,7 +7,7 @@ - + diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj index 141db526..c2ec51f6 100644 --- a/Tests/Tests.csproj +++ b/Tests/Tests.csproj @@ -6,13 +6,13 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive