Chore: Bump 16 dependencies from 2 dependabot PRs - #1159
Open
jasonleenaylor wants to merge 4 commits into
Open
jasonleenaylor wants to merge 4 commits into
jasonleenaylor wants to merge 4 commits into
Conversation
Bumps the actions-minor group with 1 update: softprops/action-gh-release. Updates `softprops/action-gh-release` from 3.0.2 to 3.0.3 --- updated-dependencies: - dependency-name: softprops/action-gh-release dependency-version: 3.0.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: actions-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps Avalonia from 11.3.17 to 11.3.22 Bumps Avalonia.Headless from 11.3.17 to 11.3.22 Bumps Avalonia.Headless.NUnit from 11.3.17 to 11.3.22 Bumps Avalonia.Skia from 11.3.17 to 11.3.22 Bumps Avalonia.Win32.Interoperability from 11.3.17 to 11.3.22 Bumps Encoding-Converters-Core from 0.9.8 to 0.9.9 Bumps SIL.Core from 18.0.0-beta0030 to 18.0.0-beta0042 Bumps SIL.LCModel from 11.0.0-beta0180 to 11.0.0-beta0182 Bumps SIL.LCModel.Core from 11.0.0-beta0180 to 11.0.0-beta0182 Bumps SIL.LCModel.Utils from 11.0.0-beta0180 to 11.0.0-beta0182 Bumps System.Diagnostics.DiagnosticSource from 9.0.2 to 9.0.20 Bumps System.Drawing.Common from 9.0.18 to 9.0.20 Bumps System.Reflection.Metadata from 10.0.10 to 10.0.12 Bumps System.Resources.Extensions from 9.0.18 to 9.0.20 Bumps System.Security.Permissions from 9.0.18 to 9.0.20 --- updated-dependencies: - dependency-name: Avalonia dependency-version: 11.3.22 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: nuget-minor - dependency-name: Avalonia.Headless dependency-version: 11.3.22 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: nuget-minor - dependency-name: Avalonia.Headless.NUnit dependency-version: 11.3.22 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: nuget-minor - dependency-name: Avalonia.Skia dependency-version: 11.3.22 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: nuget-minor - dependency-name: Avalonia.Win32.Interoperability dependency-version: 11.3.22 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: nuget-minor - dependency-name: Encoding-Converters-Core dependency-version: 0.9.9 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: nuget-minor - dependency-name: SIL.Core dependency-version: 18.0.0-beta0042 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: nuget-minor - dependency-name: SIL.LCModel dependency-version: 11.0.0-beta0182 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: nuget-minor - dependency-name: SIL.LCModel.Core dependency-version: 11.0.0-beta0182 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: nuget-minor - dependency-name: SIL.LCModel.Utils dependency-version: 11.0.0-beta0182 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: nuget-minor - dependency-name: System.Diagnostics.DiagnosticSource dependency-version: 9.0.20 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: nuget-minor - dependency-name: System.Drawing.Common dependency-version: 9.0.20 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: nuget-minor - dependency-name: System.Reflection.Metadata dependency-version: 10.0.12 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: nuget-minor - dependency-name: System.Resources.Extensions dependency-version: 9.0.20 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: nuget-minor - dependency-name: System.Security.Permissions dependency-version: 9.0.20 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: nuget-minor ... Signed-off-by: dependabot[bot] <support@github.com>
System.Diagnostics.DiagnosticSource encodes its patch in the net462 assembly version: the 9.0.2 package shipped assembly 9.0.0.2 and 9.0.20 ships 9.0.0.20. The redirect still named 9.0.0.2, so after the bump it sent Avalonia's 8.0.0.0 reference to a version no longer in the output folder. The comment above it already states the rule and the mapping, so this is the maintenance it asks for rather than a new decision.
Dependabot's nuget-minor group carries Avalonia, Headless, Headless.NUnit, Skia and Win32.Interoperability but not Avalonia.Desktop, which pulls Avalonia.Win32 transitively. Left at 11.3.17 beside the others at 11.3.22 it fails FwAvaloniaPreviewHost with MSB3277: Avalonia.Win32 11.3.17.0 against 11.3.22.0, unresolvable. Avalonia.Desktop should join the group so this does not recur.
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #1159 +/- ##
=======================================
Coverage 38.95% 38.95%
=======================================
Files 1520 1520
Lines 352476 352476
Branches 40636 40636
=======================================
+ Hits 137298 137299 +1
+ Misses 185896 185894 -2
- Partials 29282 29283 +1 🚀 New features to boost your workflow:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Combines the two open Dependabot PRs so the repository pays for one CI cycle instead of two, and carries the two fixes their bumps need to build.
Supersedes #1116, #1154 and #1117.
What it combines
softprops/action-gh-releaseAll semver-patch. No major bumps.
#1117 is an older form of the same nuget group: it still bumps
Avalonia.Themes.Fluent, which main no longer references, and it predates main's own SIL version moves. #1154 (created by@dependabot recreate) replaces it.Two fixes the bumps need
Both were found by building locally; both would have failed CI on #1154 as it stands.
Avalonia.Desktopwas left behind. Dependabot's group moved five Avalonia packages to 11.3.22 but notAvalonia.Desktop, which pullsAvalonia.Win32transitively. At 11.3.17 beside the others it failsFwAvaloniaPreviewHostoutright:The group's pattern list is
*, so this is not a scoping gap in.github/dependabot.yml;Avalonia.Desktopis a directPackageReferencein two projects and 11.3.22 is published.Avalonia.BuildServiceswas also left at 11.3.2, so it may not be a one-off.The DiagnosticSource binding redirect had to move with the package. On net462 that package encodes its patch in the assembly version: the 9.0.2 package shipped assembly
9.0.0.2and 9.0.20 ships9.0.0.20(verified by reading both packages).Src/Common/FieldWorks/App.configredirected Avalonia's8.0.0.0reference to9.0.0.2, a file that no longer exists after the bump. The comment above that redirect already states the rule -- "newVersion must match the assembly version of the deployed DLL" -- so this is the maintenance it asks for.How it was built
Original commits cherry-picked onto current
main, authors and dates preserved. #1154's commit body is prose-only and is byte-identical; #1116's body had its markdown link bullets removed to satisfy gitlint's 80-column body rule. The two fixes are separate commits so they read as deliberate changes rather than edits to a bot's commit.Verified locally
gitlint --commits origin/main..-- cleangit log --checkwhitespace -- cleanbuild.ps1 -BuildTests -SkipNative-- succeeded, 0 warnings, 0 errorsAvalonia/11.3.22,Avalonia.Desktop/11.3.22,Avalonia.Win32/11.3.22,SIL.Core/18.0.0-beta0042,SIL.LCModel/11.0.0-beta0182,System.Diagnostics.DiagnosticSource/9.0.20), so nothing was shadowed by local dev packagesSIL.Core,SIL.LCModel*andEncoding-Converters-Core, which ILRepack internalizes intoFwParatextLexiconPlugin.dll. Its external references were compared between a build oforigin/mainand a build of this branch: 52 references, identical, so nothing new has to resolve inside Paratext's process.Not verified
-SkipNative, artifacts seeded); no native source changes here.Avalonia.DesktopandAvalonia.BuildServicesfrom the group.Note for reviewers
Dependabot PRs show a red
Build Debug and run testsbecause they cannot readsecrets.CODECOV_TOKEN. This PR runs from a repository-owned branch, so its CI result is the real one.Co-authored-by: Claude Opus 5 noreply@anthropic.com
This change is