From 622373f143b1ff0fa2c252ac8f3b91459879a8d7 Mon Sep 17 00:00:00 2001 From: Dylan Date: Wed, 10 Dec 2025 23:56:56 +0000 Subject: [PATCH 1/5] Update package versions --- README.md | 2 +- makefile | 2 +- src/Directory.Packages.props | 42 ++++++++++++++++++------------------ 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 517ccd49..419a8860 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [![Build Status](https://img.shields.io/github/actions/workflow/status/dylanlangston/axkcd/release.yml?style=flat-square&logo=github)](https://github.com/dylanlangston/axkcd/actions) ![.NET](https://img.shields.io/badge/.NET-10-512BD4?style=flat-square&logo=dotnet) -![Avalonia UI](https://img.shields.io/badge/Avalonia_UI-12.x-blue?style=flat-square) +![Avalonia UI](https://img.shields.io/badge/Avalonia_UI-11.3.X-blue?style=flat-square) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg?style=flat-square)](LICENSE) **XKCD viewer for desktop and browser.** diff --git a/makefile b/makefile index ea7dee8a..9c94a4b3 100644 --- a/makefile +++ b/makefile @@ -195,5 +195,5 @@ format: ## Format source code. clean: ## Clean local environment (bin/obj folders). @cd src; dotnet clean -update: ## Update nuget packages to the latest pre-release. +update: ## Update nuget packages to the latest release. @cd src; dotnet outdated --upgrade \ No newline at end of file diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index e71d952a..963d42ce 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -6,42 +6,42 @@ - - - - - - - + + + + + + + - + - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - - - - + + + + + + - + - - - + + + - + - + \ No newline at end of file From 5547158ad0dedb09839f794aa6ca5f6165a5aa7b Mon Sep 17 00:00:00 2001 From: Dylan Date: Wed, 10 Dec 2025 23:57:22 +0000 Subject: [PATCH 2/5] Add NoWarn property for NU1902 in test project --- src/AvaloniaXKCD.Tests/AvaloniaXKCD.Tests.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/AvaloniaXKCD.Tests/AvaloniaXKCD.Tests.csproj b/src/AvaloniaXKCD.Tests/AvaloniaXKCD.Tests.csproj index 71ad07b5..b6b2cc98 100644 --- a/src/AvaloniaXKCD.Tests/AvaloniaXKCD.Tests.csproj +++ b/src/AvaloniaXKCD.Tests/AvaloniaXKCD.Tests.csproj @@ -48,4 +48,8 @@ $(DefineConstants);CI_BUILD + + + $(NoWarn);NU1902 + \ No newline at end of file From 523a80b5135581fd716eb8580e49a8a60b4c1e62 Mon Sep 17 00:00:00 2001 From: Dylan Date: Wed, 10 Dec 2025 23:58:23 +0000 Subject: [PATCH 3/5] Add new images and update references for comic #1350 --- mirror/1331/frequency_2x.png | 3 +++ .../shouldnt_be_hard.png => 1349/shouldnt_be_hard_2x.png} | 0 mirror/1350/info.0.json | 2 +- mirror/1350/lorenz.png | 3 +++ mirror/1350/lorenz_2x.png | 3 +++ 5 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 mirror/1331/frequency_2x.png rename mirror/{1350/shouldnt_be_hard.png => 1349/shouldnt_be_hard_2x.png} (100%) create mode 100644 mirror/1350/lorenz.png create mode 100644 mirror/1350/lorenz_2x.png diff --git a/mirror/1331/frequency_2x.png b/mirror/1331/frequency_2x.png new file mode 100644 index 00000000..037ffc1f --- /dev/null +++ b/mirror/1331/frequency_2x.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b19fd92f62443dd074695f702995ccc65a44c939ef9540d8d41c540ad787610 +size 94605 diff --git a/mirror/1350/shouldnt_be_hard.png b/mirror/1349/shouldnt_be_hard_2x.png similarity index 100% rename from mirror/1350/shouldnt_be_hard.png rename to mirror/1349/shouldnt_be_hard_2x.png diff --git a/mirror/1350/info.0.json b/mirror/1350/info.0.json index 6b7fb7b7..e2045357 100644 --- a/mirror/1350/info.0.json +++ b/mirror/1350/info.0.json @@ -7,7 +7,7 @@ "safeTitle": "Lorenz", "transcript": "((This April Fools\u0027 Day comic has a dynamic panel structure along the lines of a choose-your-own-adventure format - the viewer is presented with up to 4 options for each bit of dialogue, with each choice opening up a new subtree of potential options for the next bit of dialog, and new panel images are chosen semi-randomly based on a graph of potential panel transitions. Readers were also invited to submit dialog options for trees where there were not yet 4 fixed options, thus growing the potential story space. As such there is no fixed transcript for this comic.))\n\n{{Title text: Every choice, no matter how small, begins a new story.}}", "alt": "Every choice, no matter how small, begins a new story.", - "img": "1350/shouldnt_be_hard.png", + "img": "1350/lorenz.png", "title": "Lorenz", "day": "1", "baseUri": "https://dylanlangston.github.io/Axkcd/" diff --git a/mirror/1350/lorenz.png b/mirror/1350/lorenz.png new file mode 100644 index 00000000..5a091c36 --- /dev/null +++ b/mirror/1350/lorenz.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:87996053d57862a6940d9db45d0f8adcdb8b1a0bdc0f7bcb3207fcefc56b962f +size 28211 diff --git a/mirror/1350/lorenz_2x.png b/mirror/1350/lorenz_2x.png new file mode 100644 index 00000000..5a091c36 --- /dev/null +++ b/mirror/1350/lorenz_2x.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:87996053d57862a6940d9db45d0f8adcdb8b1a0bdc0f7bcb3207fcefc56b962f +size 28211 From a5f067e188c4c80eb99d9bb84a0a644290a792bd Mon Sep 17 00:00:00 2001 From: Dylan Date: Wed, 10 Dec 2025 23:59:43 +0000 Subject: [PATCH 4/5] Add NoWarn property for NU1902 in Directory.Build.props and remove from test project --- src/AvaloniaXKCD.Tests/AvaloniaXKCD.Tests.csproj | 4 ---- src/Directory.Build.props | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/AvaloniaXKCD.Tests/AvaloniaXKCD.Tests.csproj b/src/AvaloniaXKCD.Tests/AvaloniaXKCD.Tests.csproj index b6b2cc98..71ad07b5 100644 --- a/src/AvaloniaXKCD.Tests/AvaloniaXKCD.Tests.csproj +++ b/src/AvaloniaXKCD.Tests/AvaloniaXKCD.Tests.csproj @@ -48,8 +48,4 @@ $(DefineConstants);CI_BUILD - - - $(NoWarn);NU1902 - \ No newline at end of file diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 57f151d2..9b1307d9 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -32,4 +32,7 @@ + + $(NoWarn);NU1902 + \ No newline at end of file From 5b614579e4bdfbcd02e07c52895d243a4ac75e2a Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 11 Dec 2025 00:59:29 +0000 Subject: [PATCH 5/5] Fix failing Desktop tests --- src/AvaloniaXKCD.Tests/Orchestration/HeadlessAvalonia.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AvaloniaXKCD.Tests/Orchestration/HeadlessAvalonia.cs b/src/AvaloniaXKCD.Tests/Orchestration/HeadlessAvalonia.cs index 3ba507a7..fb5c25c5 100644 --- a/src/AvaloniaXKCD.Tests/Orchestration/HeadlessAvalonia.cs +++ b/src/AvaloniaXKCD.Tests/Orchestration/HeadlessAvalonia.cs @@ -39,7 +39,7 @@ public async ValueTask ExecuteTest(TestContext context, Func action) .Metadata .TestDetails .TestClassInjectedPropertyArguments - .Single((a) => a.Key == nameof(HeadlessAvalonia)).Value as HeadlessAvalonia; + .FirstOrDefault(x => x.Value is HeadlessAvalonia).Value as HeadlessAvalonia; if (headlessAvalonia == null) throw new NullReferenceException();