Skip to content

Conversation

Jack251970
Copy link
Member

@Jack251970 Jack251970 commented Aug 17, 2025

Upgrade Nuget packages & Update lock files

Update all Nuget packages and update related lock files.

Suppress FLSG0007 warning

Since plenty of strings are only used in Xaml design, FLSG0007 warnings for them are unnecessary.

Test

All updates are minor version updates, and there is almost no difference in memory usage during testing.

Memory usage:

665mb -> 667mb

Installer size:

101mb -> 98mb

@Jack251970 Jack251970 added the dependencies Pull requests that update a dependency file label Aug 17, 2025
@Jack251970 Jack251970 added this to the 2.0.0 milestone Aug 17, 2025
Copy link

gitstream-cm bot commented Aug 17, 2025

Be a legend 🏆 by adding a before and after screenshot of the changes you made, especially if they are around UI/UX.

Copy link
Contributor

coderabbitai bot commented Aug 17, 2025

Warning

Rate limit exceeded

@Jack251970 has exceeded the limit for the number of commits or files that can be reviewed per hour. Please wait 23 minutes and 57 seconds before requesting another review.

⌛ How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.

Please see our FAQ for further information.

📥 Commits

Reviewing files that changed from the base of the PR and between 8bc60e5 and 8e837b8.

📒 Files selected for processing (3)
  • Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj (2 hunks)
  • Plugins/Flow.Launcher.Plugin.Calculator/Flow.Launcher.Plugin.Calculator.csproj (2 hunks)
  • Plugins/Flow.Launcher.Plugin.Explorer/Flow.Launcher.Plugin.Explorer.csproj (2 hunks)
📝 Walkthrough

Walkthrough

Project-wide NuGet version bumps and lockfile refreshes across core, infrastructure, main app, plugins, and tests (examples: Microsoft.Extensions.* → 9.0.8, NLog → 6.0.3, FSharp.Core → 9.0.303, JetBrains.Annotations → 2025.2.x, NUnit → 4.4.0). No source-code or public API changes.

Changes

Cohort / File(s) Summary
Core package updates
Flow.Launcher.Core/Flow.Launcher.Core.csproj, Flow.Launcher.Core/packages.lock.json
FSharp.Core 9.0.300 → 9.0.303; lockfile refreshed with transitive bumps (JetBrains.Annotations, NLog family, SharpVectors.Wpf) and updated hashes.
Infrastructure package updates
Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj, Flow.Launcher.Infrastructure/packages.lock.json
Fody 6.9.2 → 6.9.3; NLog & NLog.OutputDebugString 6.0.1 → 6.0.3; SharpVectors.Wpf 1.8.4.2 → 1.8.5; lockfile aligned.
Main app package updates
Flow.Launcher/Flow.Launcher.csproj, Flow.Launcher/packages.lock.json
Microsoft.Extensions.* cascade 9.0.7 → 9.0.8; Fody 6.9.2 → 6.9.3; VirtualizingWrapPanel 2.3.0 → 2.3.1; lockfile updated.
Plugin SDK / annotations
Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj, Flow.Launcher.Plugin/packages.lock.json
JetBrains.Annotations 2024.3.0 → 2025.2.x; Fody → 6.9.3; lockfile updated.
Test framework updates
Flow.Launcher.Test/Flow.Launcher.Test.csproj
NUnit 4.3.2 → 4.4.0; NUnit3TestAdapter 5.0.0 → 5.1.0.
BrowserBookmark plugin updates
Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj
Flow.Launcher.Localization 0.0.4 → 0.0.5; Svg.Skia 3.0.4 → 3.0.6; added NoWarn FLSG0007 in Release.
Calculator plugin updates
Plugins/Flow.Launcher.Plugin.Calculator/Flow.Launcher.Plugin.Calculator.csproj
Flow.Launcher.Localization 0.0.4 → 0.0.5; added NoWarn FLSG0007 in Release.
Explorer plugin updates
Plugins/Flow.Launcher.Plugin.Explorer/Flow.Launcher.Plugin.Explorer.csproj
Flow.Launcher.Localization 0.0.4 → 0.0.5; System.Data.OleDb 9.0.7 → 9.0.8; added NoWarn FLSG0007 in Release.
Program plugin updates
Plugins/Flow.Launcher.Plugin.Program/Flow.Launcher.Plugin.Program.csproj
Microsoft.Extensions.Caching.Memory 9.0.7 → 9.0.8; NLog aligned to 6.0.3 (was 4.7.10).

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Possibly related PRs

Suggested reviewers

  • jjw24
  • taooceros
✨ Finishing Touches
🧪 Generate unit tests
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch nuget_package_upgrade

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Nitpick comments (5)
Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj (1)

70-77: JetBrains.Annotations 2025.2.0: OK. Consider removing explicit SourceLink package on .NET 9.

  • JetBrains.Annotations bump is fine.
  • On SDK 8+ SourceLink is included by default. Keeping Microsoft.SourceLink.GitHub is redundant unless you’re overriding defaults.

Apply to simplify:

   <PackageReference Include="Fody" Version="6.9.2">
     <PrivateAssets>all</PrivateAssets>
     <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
   </PackageReference>
-  <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
   <PackageReference Include="JetBrains.Annotations" Version="2025.2.0" />
Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj (1)

100-106: Svg.Skia and SkiaSharp version consistency verified

  • Only one reference to Svg.Skia 3.0.5 and SkiaSharp 3.119.0 exists in this plugin; no mismatches detected across the repo.
  • Flow.Launcher.Localization 0.0.5 remains unchanged and unaffected.
  • If bundle size is a concern, consider mirroring the runtime‐cleanup targets used in sibling plugins:
<Target Name="RemoveUnnecessaryRuntimesAfterBuild" AfterTargets="Build">
  <RemoveDir Directories="$(OutputPath)runtimes\browser-wasm;$(OutputPath)runtimes\linux-*;$(OutputPath)runtimes\maccatalyst-*;$(OutputPath)runtimes\osx*"/>
</Target>
<Target Name="RemoveUnnecessaryRuntimesAfterPublish" AfterTargets="Publish">
  <RemoveDir Directories="$(PublishDir)runtimes\browser-wasm;$(PublishDir)runtimes\linux-*;$(PublishDir)runtimes\maccatalyst-*;$(PublishDir)runtimes\osx*"/>
</Target>
Flow.Launcher.Infrastructure/packages.lock.json (1)

81-81: Consider avoiding open-ended version ranges for deterministic builds

The “requested” constraints are open-ended (e.g., [6.0.3, ), [1.8.5, ), [9.0.8, )). The lockfile pins today, but future restores without locked mode can drift to newer 9.x and cause surprise CI differences.

  • Prefer exact versions or central package management (Directory.Packages.props) to pin ranges.
  • Enforce restore with locked mode in CI to keep reproducibility.

I can help generate a follow-up PR to centralize and pin if desired.

Also applies to: 87-87, 105-105, 111-111, 193-193

Flow.Launcher.Core/packages.lock.json (1)

262-266: Pin project-level dependency ranges to prevent future drift

The project dependency constraints are open-ended (e.g., [6.0.3, ), [1.8.5, ), [9.0.8, ), JetBrains.Annotations [2025.2.0, )). To avoid unintentional upgrades in a future restore:

  • Pin exact versions via Directory.Packages.props or set floating ranges to a bounded minor window if needed.
  • Ensure CI uses dotnet restore --locked-mode.

Happy to assist if you want this tightened in the same PR or a follow-up.

Also applies to: 272-272

Flow.Launcher/packages.lock.json (1)

74-76: Ensure restore drift is prevented: centralize versions and enforce locked restores

  • No Directory.Packages.props found in the repo – consider adding one for central package version management.
  • All critical PackageReference entries are already pinned exactly (e.g., Microsoft.Extensions.* 9.0.8, NLog 6.0.3, SharpVectors.Wpf 1.8.5, JetBrains.Annotations 2025.2.0).
  • No GitHub Actions workflows detected under .github/workflows – please verify your CI pipeline invokes dotnet restore --locked-mode (or the equivalent flag in your CI) so the lockfile ranges ([9.0.8, ), etc.) cannot float to newer versions.

Recommendations:

  • Introduce Directory.Packages.props or pin exact versions in each csproj.
  • Update your CI build definition to always pass --locked-mode to dotnet restore.
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

💡 Knowledge Base configuration:

  • MCP integration is disabled by default for public repositories
  • Jira integration is disabled by default for public repositories
  • Linear integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.

📥 Commits

Reviewing files that changed from the base of the PR and between ebdea4f and 922c3d5.

📒 Files selected for processing (13)
  • Flow.Launcher.Core/Flow.Launcher.Core.csproj (1 hunks)
  • Flow.Launcher.Core/packages.lock.json (6 hunks)
  • Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj (1 hunks)
  • Flow.Launcher.Infrastructure/packages.lock.json (5 hunks)
  • Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj (1 hunks)
  • Flow.Launcher.Plugin/packages.lock.json (1 hunks)
  • Flow.Launcher.Test/Flow.Launcher.Test.csproj (1 hunks)
  • Flow.Launcher/Flow.Launcher.csproj (2 hunks)
  • Flow.Launcher/packages.lock.json (11 hunks)
  • Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj (1 hunks)
  • Plugins/Flow.Launcher.Plugin.Calculator/Flow.Launcher.Plugin.Calculator.csproj (1 hunks)
  • Plugins/Flow.Launcher.Plugin.Explorer/Flow.Launcher.Plugin.Explorer.csproj (1 hunks)
  • Plugins/Flow.Launcher.Plugin.Program/Flow.Launcher.Plugin.Program.csproj (1 hunks)
🧰 Additional context used
🧠 Learnings (2)
📚 Learning: 2024-10-08T15:52:58.573Z
Learnt from: taooceros
PR: Flow-Launcher/Flow.Launcher#2616
File: Flow.Launcher/Flow.Launcher.csproj:7-7
Timestamp: 2024-10-08T15:52:58.573Z
Learning: In the Flow Launcher project, the version number in the `Flow.Launcher.csproj` file is dynamically updated during the CI/CD process.

Applied to files:

  • Plugins/Flow.Launcher.Plugin.Explorer/Flow.Launcher.Plugin.Explorer.csproj
  • Plugins/Flow.Launcher.Plugin.Program/Flow.Launcher.Plugin.Program.csproj
  • Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
  • Flow.Launcher.Core/Flow.Launcher.Core.csproj
  • Flow.Launcher.Test/Flow.Launcher.Test.csproj
  • Flow.Launcher.Plugin/packages.lock.json
  • Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj
  • Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj
  • Flow.Launcher.Infrastructure/packages.lock.json
  • Plugins/Flow.Launcher.Plugin.Calculator/Flow.Launcher.Plugin.Calculator.csproj
  • Flow.Launcher/Flow.Launcher.csproj
  • Flow.Launcher/packages.lock.json
  • Flow.Launcher.Core/packages.lock.json
📚 Learning: 2024-10-08T15:52:58.573Z
Learnt from: taooceros
PR: Flow-Launcher/Flow.Launcher#2442
File: Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj:4-4
Timestamp: 2024-10-08T15:52:58.573Z
Learning: In .NET 8, SourceLink is included by default, eliminating the need for the `Microsoft.SourceLink.GitHub` package.

Applied to files:

  • Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
🪛 GitHub Check: Check Spelling
Flow.Launcher.Core/packages.lock.json

[warning] 210-210:
NLog is not a recognized word. (unrecognized-spelling)


[warning] 205-205:
NLog is not a recognized word. (unrecognized-spelling)


[warning] 263-263:
NLog is not a recognized word. (unrecognized-spelling)


[warning] 262-262:
NLog is not a recognized word. (unrecognized-spelling)

⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (3)
  • GitHub Check: gitStream workflow automation
  • GitHub Check: gitStream.cm
  • GitHub Check: build
🔇 Additional comments (11)
Flow.Launcher.Core/Flow.Launcher.Core.csproj (1)

56-64: Lock file consistency confirmed for FSharp.Core 9.0.303

Flow.Launcher.Core/packages.lock.json shows
• type: Direct
• requested: “[9.0.303, )”
• resolved: “9.0.303”

No further action needed.

Plugins/Flow.Launcher.Plugin.Explorer/Flow.Launcher.Plugin.Explorer.csproj (1)

48-54: Localization and OleDb upgrades approved

  • Verified that Flow.Launcher.Localization has been updated to 0.0.5 everywhere—no remaining 0.0.4 references.
  • System.Data.OleDb bumped to 9.0.8 is fine on Windows; ensure target machines have the required OLE DB provider installed.
Flow.Launcher.Test/Flow.Launcher.Test.csproj (1)

50-58: NUnit 4.4.0 + Adapter 5.1.0 compatibility verified
No obsolete NUnit 3 attributes ([RequiresSTA], [RequiresMTA], [Apartment]) were found in the test code. The upgrade is approved—just keep an eye on CI/test discovery for any defaults that might have shifted.

Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj (1)

71-77: All key package versions are consistent across projects

  • NLog is pinned to 6.0.3 in both Flow.Launcher.Infrastructure and Flow.Launcher.Plugin.Program.
  • NLog.OutputDebugString (6.0.3), SharpVectors.Wpf (1.8.5), and System.Drawing.Common (9.0.8) are only referenced in the Infrastructure project, as expected.

No version mismatches or duplicate bindings detected.

Plugins/Flow.Launcher.Plugin.Calculator/Flow.Launcher.Plugin.Calculator.csproj (1)

65-65: Localization bump to 0.0.5 verified for Calculator plugin
Resources referenced in Plugins/Flow.Launcher.Plugin.Calculator:

  • Views/CalculatorSettings.xaml (lines 30 & 50)
    • DynamicResource flowlauncher_plugin_calculator_output_decimal_separator
    • DynamicResource flowlauncher_plugin_calculator_max_decimal_places

No x:Uid attributes detected. Please smoke-test the Calculator settings UI and confirm both labels resolve correctly at runtime.

Plugins/Flow.Launcher.Plugin.Program/Flow.Launcher.Plugin.Program.csproj (1)

67-73: Confirm NLog major-version upgrade and compatibility

The PR now bumps NLog from 4.x to 6.0.3 across the solution. Before merging, please confirm:

  • Intent to upgrade NLog to 6.0.3 in all projects:
    • Flow.Launcher.Infrastructure (Flow.Launcher.Infrastructure.csproj)
    • Flow.Launcher.Plugin.Program (Flow.Launcher.Plugin.Program.csproj)
  • Code references that must be tested for breaking changes:
    • Flow.Launcher.Infrastructure/Logger/Log.cs (uses NLog.Config, NLog.Targets, NLog.Targets.Wrappers)
    • Flow.Launcher/Helper/ErrorReporting.cs
    • Plugins/Flow.Launcher.Plugin.Program/Logger/ProgramLogger.cs
  • No <nlog> configuration blocks found in any .config files—if you rely on runtime config, ensure defaults or embedded settings still apply correctly in Flow.Launcher.
  • Validate in the Flow.Launcher host that logging behavior, formatting and targets haven’t regressed.

Minor: Microsoft.Extensions.Caching.Memory is already aligned to 9.0.8.

Flow.Launcher.Plugin/packages.lock.json (1)

13-15: JetBrains.Annotations resolved to 2025.2.0; lock entry is consistent

The requested/resolved versions and contentHash update are consistent for net9.0-windows7.0. No further action needed.

Flow.Launcher/Flow.Launcher.csproj (1)

140-152: Microsoft.Extensions. Versions Verified*

All Microsoft.Extensions.* package references are consistently updated to version 9.0.8 across the solution:

  • Flow.Launcher/Flow.Launcher.csproj
    • Microsoft.Extensions.DependencyInjection 9.0.8
    • Microsoft.Extensions.Hosting 9.0.8
  • Plugins/Flow.Launcher.Plugin.Program/Flow.Launcher.Plugin.Program.csproj
    • Microsoft.Extensions.Caching.Memory 9.0.8

No further action required.

Flow.Launcher.Infrastructure/packages.lock.json (1)

81-83: Lockfile bumps are consistent and look good

  • NLog stack to 6.0.3
  • SharpVectors.Wpf to 1.8.5
  • System.Drawing.Common/Microsoft.Win32.SystemEvents to 9.0.8
  • JetBrains.Annotations to 2025.2.0 (project and transitive)

These align with the PR intent and keep the ecosystem versions coherent. No red flags.

Also applies to: 87-93, 105-107, 111-116, 126-128, 159-161, 193-193

Flow.Launcher.Core/packages.lock.json (1)

16-18: Core lockfile updates are coherent across projects

  • FSharp.Core to 9.0.303
  • JetBrains.Annotations to 2025.2.0
  • NLog + OutputDebugString to 6.0.3
  • SharpVectors.Wpf to 1.8.5
  • System.Drawing.Common/Microsoft.Win32.SystemEvents to 9.0.8
  • Project dependency blocks mirror these versions

Matches the infrastructure and root lockfiles; no compatibility concerns expected for these minor bumps.

Also applies to: 93-95, 164-166, 202-204, 207-212, 215-217, 225-229, 262-266, 272-272

Flow.Launcher/packages.lock.json (1)

74-109: Broad upgrades to Microsoft.Extensions 9.0.8 and related packages are consistent

The DI/Hosting/Logging stack and their abstractions/providers are uniformly at 9.0.8. Ancillaries (VirtualizingWrapPanel 2.3.1, FSharp.Core 9.0.303, NLog 6.0.3, SharpVectors.Wpf 1.8.5, System.Drawing.Common and EventLog 9.0.8, JetBrains.Annotations 2025.2.0) are aligned across root, Core, and Infrastructure lockfiles. This reduces assembly binding mismatches across projects. LGTM.

Also applies to: 157-159, 199-201, 214-216, 255-263, 265-271, 273-279, 281-288, 290-297, 299-309, 311-320, 322-331, 333-336, 338-346, 348-355, 356-363, 365-373, 375-378, 380-390, 392-400, 402-408, 410-423, 425-435, 437-445, 447-457, 459-469, 471-478, 480-490, 492-495, 555-557, 593-603, 610-613, 675-677, 679-685, 841-849, 862-866, 872-873

@coderabbitai coderabbitai bot added the bug Something isn't working label Aug 19, 2025
@jjw24
Copy link
Member

jjw24 commented Aug 25, 2025

Let's leave this after 2.0.0, I don't want to make so many dependcy version changes at this time without some lengthy testing.

@jjw24
Copy link
Member

jjw24 commented Aug 25, 2025

Memory usage:
665mb -> 667mb

What is this memory usage? If it's flow, is this average usage or is it from certain usage pattern?

@jjw24 jjw24 modified the milestones: 2.0.0, Future Aug 25, 2025
@Jack251970
Copy link
Member Author

Jack251970 commented Aug 25, 2025

Memory usage:
665mb -> 667mb

What is this memory usage? If it's flow, is this average usage or is it from certain usage pattern?

It was tested under my pc with about 20 plugins. I just started the Flow and searched something.

@coderabbitai coderabbitai bot added the enhancement New feature or request label Aug 25, 2025
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Nitpick comments (1)
Flow.Launcher/packages.lock.json (1)

851-868: flow.launcher.infrastructure project deps updated (NLog, SharpVectors, System.Drawing)

Project-level constraints match lockfile. Ensure csproj versions are centrally managed to avoid drift; consider Directory.Packages.props post-2.0 if not already used.

📜 Review details

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

💡 Knowledge Base configuration:

  • MCP integration is disabled by default for public repositories
  • Jira integration is disabled by default for public repositories
  • Linear integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.

📥 Commits

Reviewing files that changed from the base of the PR and between b07763a and 6b60373.

📒 Files selected for processing (7)
  • Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj (2 hunks)
  • Flow.Launcher.Infrastructure/packages.lock.json (6 hunks)
  • Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj (1 hunks)
  • Flow.Launcher.Plugin/packages.lock.json (1 hunks)
  • Flow.Launcher/Flow.Launcher.csproj (3 hunks)
  • Flow.Launcher/packages.lock.json (12 hunks)
  • Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj (2 hunks)
🚧 Files skipped from review as they are similar to previous changes (5)
  • Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj
  • Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj
  • Flow.Launcher/Flow.Launcher.csproj
  • Flow.Launcher.Plugin/packages.lock.json
  • Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
🧰 Additional context used
🧠 Learnings (1)
📚 Learning: 2024-10-08T15:52:58.573Z
Learnt from: taooceros
PR: Flow-Launcher/Flow.Launcher#2616
File: Flow.Launcher/Flow.Launcher.csproj:7-7
Timestamp: 2024-10-08T15:52:58.573Z
Learning: In the Flow Launcher project, the version number in the `Flow.Launcher.csproj` file is dynamically updated during the CI/CD process.

Applied to files:

  • Flow.Launcher/packages.lock.json
  • Flow.Launcher.Infrastructure/packages.lock.json
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (1)
  • GitHub Check: build
🔇 Additional comments (19)
Flow.Launcher.Infrastructure/packages.lock.json (5)

81-84: NLog/NLog.OutputDebugString → 6.0.3: patch-level; smoke-test sinks

Patch update should be safe. Please smoke-test logging to file/console/debug and ensure existing NLog.config targets/layout renderers behave the same.

Also applies to: 86-93


105-108: SharpVectors.Wpf → 1.8.5: verify SVG rendering and DPI

Minor bump. Run through UI areas that render SVG (icons, plugin logos) and confirm no scaling/color regressions.


111-116: System.Drawing.Common/Microsoft.Win32.SystemEvents → 9.0.8: Windows-only OK; test icon loading

Target TFM is net9.0-windows7.0, so staying on supported Windows implementation is correct. Please sanity-check any GDI+ icon/thumbnails and event-driven image refresh listeners.

Also applies to: 157-161


125-128: JetBrains.Annotations → 2025.2.0 aligned across infra and plugin

Version alignment looks good; no API changes expected for annotations usage. Nothing further from my side.

Also applies to: 191-194


28-31: Fody 6.9.3 bump verified across lockfiles—clean rebuild & weaver check needed

  • All packages.lock.json files in Flow.Launcher, Flow.Launcher.Infrastructure, and Flow.Launcher.Plugin resolve Fody to 6.9.3 as expected.
  • PropertyChanged.Fody 4.1.0 declares a minimum Fody 6.6.4, so the bumped version satisfies its requirements.

Please perform a local clean rebuild so that the Fody weaver tasks execute, and verify there are no build-time warnings or regressions in the injected INotifyPropertyChanged code paths. Let me know if anything surfaces during that build.

Flow.Launcher/packages.lock.json (14)

155-160: VirtualizingWrapPanel → 2.3.1: test long result lists and keyboard nav

UI virtualization can be sensitive. Please scroll through long search result sets, resize the window, and test keyboard selection to catch regressions.


199-201: FSharp.Core → 9.0.303 (transitive via flow.launcher.core)

Matches core csproj. No concerns; keep plugin projects consistent if any reference FSharp directly.


213-216: JetBrains.Annotations → 2025.2.0 (transitive)

Aligned with plugin/infrastructure. Safe; no runtime impact.


255-330: Configuration packages → 9.0.8: validate binding of complex options

Patch-level. Please verify options binding scenarios (arrays, nested objects, enums) still bind as expected from appsettings.json and environment variables.


331-336: DI/Diagnostics/Options → 9.0.8: check health of OptionsMonitor and logging scopes

Confirm OptionsMonitor updates propagate at runtime and that logging scopes and Activity/diag events still appear in logs as before.

Also applies to: 338-355, 470-495


356-373: FileProviders/Globbing/Hosting.Abstractions → 9.0.8

Looks consistent. Sanity-check any file-watching or plugin folder reload behavior.

Also applies to: 374-378, 379-390


391-470: Logging stack → 9.0.8: verify console/debug/event log targets

Ensure log levels and filters behave the same and that EventLog target still writes under expected source.


553-557: SystemEvents/EventLog/System.Drawing.Common → 9.0.8: Windows integrations

Good to see these on the same patch. Please test:

  • SystemEvents-driven updates (theme or display change) refresh UI as before.
  • EventLog targets write successfully without elevated permissions.
  • Any GDI+ icon manipulations remain correct.

Also applies to: 673-677, 678-685


591-603: NLog family → 6.0.3: patch-level sync

Consistent with Infrastructure. Quick regression pass on NLog targets (file, debug, eventlog) recommended.


611-613: SharpVectors.Wpf → 1.8.5: verify SVG assets in themes/plugins

Same note as infra: check SVG rendering in dark/light themes and high DPI.


837-850: flow.launcher.core project deps: FSharp.Core pinned to 9.0.303

Good alignment with lock. No action needed.


870-873: flow.launcher.plugin: JetBrains.Annotations → [2025.2.0, )

Explicitly constraining here helps keep the graph consistent. LGTM.


72-110: Full-stack Microsoft.Extensions. versions consistent—proceed with runtime smoke tests*

  • ✅ All Microsoft.Extensions.* dependencies across all packages.lock.json files resolve to 9.0.8, confirming patch-level consistency.
  • ▶️ Next, perform manual runtime validation:
    • Start the application with a representative set of plugins.
    • Verify clean startup and shutdown, correct service registrations, and that configuration binding works end-to-end.
    • Confirm no warnings or errors about duplicate/mismatched Microsoft.Extensions.* versions in the logs.

19-21: Ensure Fody is Consistently at 6.9.3 Across All Projects

I wasn’t able to confirm automatically (the initial script failed due to a missing paste utility), so please verify that every packages.lock.json lists Fody’s resolved version as 6.9.3. In particular, check:

  • Flow.Launcher/packages.lock.json
  • Flow.Launcher.Core/packages.lock.json
  • Flow.Launcher.Infrastructure/packages.lock.json
  • Flow.Launcher.Plugin/packages.lock.json

Each should contain a dependency entry similar to:

"Fody": {
  "requested": "[6.9.3, )",
  "resolved": "6.9.3",
  "contentHash": ""
}

If any project is out of sync, update its Fody reference (in the corresponding .csproj or package configuration) so that all lockfiles restore to 6.9.3.

@jjw24
Copy link
Member

jjw24 commented Aug 30, 2025

Memory usage:
665mb -> 667mb

What is this memory usage? If it's flow, is this average usage or is it from certain usage pattern?

It was tested under my pc with about 20 plugins. I just started the Flow and searched something.

what's your pc's memory?

@Jack251970
Copy link
Member Author

Memory usage:
665mb -> 667mb

What is this memory usage? If it's flow, is this average usage or is it from certain usage pattern?

It was tested under my pc with about 20 plugins. I just started the Flow and searched something.

what's your pc's memory?

32GB RAM. Why is this important?

@jjw24
Copy link
Member

jjw24 commented Aug 30, 2025

Because on Win 11 when ram is 32gb, apps consume more ram than when it's 16gb. I run flow on 16gb so my usage is around the 135mb mark. I wasn't sure your 665mb is from 32gb machine or this PR change.

@Jack251970
Copy link
Member Author

Because on Win 11 when ram is 32gb, apps consume more ram than when it's 16gb. I run flow on 16gb so my usage is around the 135mb mark. I wasn't sure your 665mb is from 32gb machine or this PR change.

Oh, actually, I mean that: [before_PR] -> [after_PR]

Copy link

gitstream-cm bot commented Aug 30, 2025

🥷 Code experts: no user but you matched threshold 10

Jack251970 has most 👩‍💻 activity in the files.
Jack251970, jjw24 have most 🧠 knowledge in the files.

See details

Flow.Launcher.Core/Flow.Launcher.Core.csproj

Activity based on git-commit:

Jack251970
AUG
JUL 3 additions & 3 deletions
JUN
MAY
APR
MAR

Knowledge based on git-blame:
jjw24: 14%
Jack251970: 4%

Flow.Launcher.Core/packages.lock.json

Activity based on git-commit:

Jack251970
AUG 11 additions & 11 deletions
JUL 103 additions & 64 deletions
JUN
MAY
APR
MAR

Knowledge based on git-blame:
Jack251970: 37%

Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj

Activity based on git-commit:

Jack251970
AUG 4 additions & 2 deletions
JUL 10 additions & 17 deletions
JUN
MAY
APR 4 additions & 1 deletions
MAR 0 additions & 1 deletions

Knowledge based on git-blame:
Jack251970: 28%
jjw24: 11%

Flow.Launcher.Infrastructure/packages.lock.json

Activity based on git-commit:

Jack251970
AUG 15 additions & 15 deletions
JUL 92 additions & 49 deletions
JUN
MAY
APR
MAR

Knowledge based on git-blame:
Jack251970: 48%

Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj

Activity based on git-commit:

Jack251970
AUG
JUL 5 additions & 4 deletions
JUN
MAY
APR 3 additions & 1 deletions
MAR

Knowledge based on git-blame:
Jack251970: 17%
jjw24: 9%

Flow.Launcher.Plugin/packages.lock.json

Activity based on git-commit:

Jack251970
AUG
JUL 26 additions & 26 deletions
JUN
MAY
APR
MAR

Knowledge based on git-blame:
Jack251970: 34%

Flow.Launcher.Test/Flow.Launcher.Test.csproj

Activity based on git-commit:

Jack251970
AUG
JUL 3 additions & 3 deletions
JUN
MAY
APR
MAR

Knowledge based on git-blame:
jjw24: 22%
Jack251970: 5%

Flow.Launcher/Flow.Launcher.csproj

Activity based on git-commit:

Jack251970
AUG 84 additions & 43 deletions
JUL 7 additions & 8 deletions
JUN 5 additions & 0 deletions
MAY
APR 3 additions & 1 deletions
MAR 1 additions & 5 deletions

Knowledge based on git-blame:
Jack251970: 30%
jjw24: 10%

Flow.Launcher/packages.lock.json

Activity based on git-commit:

Jack251970
AUG 9 additions & 9 deletions
JUL 498 additions & 282 deletions
JUN
MAY
APR
MAR

Knowledge based on git-blame:
Jack251970: 56%

Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj

Activity based on git-commit:

Jack251970
AUG 4 additions & 0 deletions
JUL 1 additions & 1 deletions
JUN 36 additions & 35 deletions
MAY
APR 2 additions & 2 deletions
MAR 35 additions & 35 deletions

Knowledge based on git-blame:
Jack251970: 35%
jjw24: 34%

Plugins/Flow.Launcher.Plugin.Calculator/Flow.Launcher.Plugin.Calculator.csproj

Activity based on git-commit:

Jack251970
AUG
JUL
JUN 2 additions & 2 deletions
MAY
APR
MAR

Knowledge based on git-blame:
jjw24: 17%
Jack251970: 1%

Plugins/Flow.Launcher.Plugin.Explorer/Flow.Launcher.Plugin.Explorer.csproj

Activity based on git-commit:

Jack251970
AUG
JUL 2 additions & 3 deletions
JUN 1 additions & 1 deletions
MAY 1 additions & 2 deletions
APR 2 additions & 1 deletions
MAR 2 additions & 1 deletions

Knowledge based on git-blame:
jjw24: 72%
Jack251970: 7%

Plugins/Flow.Launcher.Plugin.Program/Flow.Launcher.Plugin.Program.csproj

Activity based on git-commit:

Jack251970
AUG
JUL 2 additions & 2 deletions
JUN 2 additions & 1 deletions
MAY
APR
MAR

Knowledge based on git-blame:
Jack251970: 15%
jjw24: 13%

✨ Comment /gs review for LinearB AI review. Learn how to automate it here.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Nitpick comments (2)
Flow.Launcher.Core/packages.lock.json (1)

200-206: Spell-check warnings for “NLog”.
Add “NLog” to the repository dictionary to silence false positives.

Flow.Launcher/packages.lock.json (1)

1-1: Lockfile hygiene/CI suggestion.
Add a CI step to enforce locked restores to prevent drift after merge.

Example (GitHub Actions):

+      - name: Restore (locked)
+        run: dotnet restore --locked-mode
📜 Review details

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

💡 Knowledge Base configuration:

  • MCP integration is disabled by default for public repositories
  • Jira integration is disabled by default for public repositories
  • Linear integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.

📥 Commits

Reviewing files that changed from the base of the PR and between 528687c and 6e873ab.

📒 Files selected for processing (5)
  • Flow.Launcher.Core/packages.lock.json (4 hunks)
  • Flow.Launcher.Infrastructure/packages.lock.json (5 hunks)
  • Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj (1 hunks)
  • Flow.Launcher.Plugin/packages.lock.json (1 hunks)
  • Flow.Launcher/packages.lock.json (11 hunks)
🚧 Files skipped from review as they are similar to previous changes (3)
  • Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
  • Flow.Launcher.Infrastructure/packages.lock.json
  • Flow.Launcher.Plugin/packages.lock.json
🧰 Additional context used
🧠 Learnings (1)
📚 Learning: 2024-10-08T15:52:58.573Z
Learnt from: taooceros
PR: Flow-Launcher/Flow.Launcher#2616
File: Flow.Launcher/Flow.Launcher.csproj:7-7
Timestamp: 2024-10-08T15:52:58.573Z
Learning: In the Flow Launcher project, the version number in the `Flow.Launcher.csproj` file is dynamically updated during the CI/CD process.

Applied to files:

  • Flow.Launcher/packages.lock.json
  • Flow.Launcher.Core/packages.lock.json
🪛 GitHub Check: Check Spelling
Flow.Launcher.Core/packages.lock.json

[warning] 210-210:
NLog is not a recognized word. (unrecognized-spelling)


[warning] 205-205:
NLog is not a recognized word. (unrecognized-spelling)

⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (1)
  • GitHub Check: build
🔇 Additional comments (14)
Flow.Launcher.Core/packages.lock.json (5)

93-95: JetBrains.Annotations 2025.2.1 — low risk.
Pure attribute package; no runtime impact expected. LGTM.


202-211: NLog and OutputDebugString patched to 6.0.3 — validate config loads and targets.
Patch-level; still recommend a quick smoke test that NLog.config loads and OutputDebugString target still works.


214-217: SharpVectors.Wpf 1.8.5 — verify SVG rendering in UI.
Minor bump; do a quick pass over SVG icons to catch regressions.


4-4: TFM mismatch check: net9.0-windows7.0 (Core) vs app’s windows10.0.19041.
This is usually fine, but confirm Core doesn’t rely on Windows 10–only APIs via transitive packages.


16-18: Patch bump to FSharp.Core is safe; no F# projects found.

Flow.Launcher/packages.lock.json (9)

19-21: Fody 6.9.3 — build-time weaver update.
Patch bump; ensure Release build succeeds locally and on CI (weaving sometimes tightens MSBuild tasks).


72-110: Microsoft.Extensions. → 9.0.8 across the board.*
Consistent patch upgrade; no API surface change expected. LGTM.


157-159: VirtualizingWrapPanel 2.3.1 — quick UI scroll test.
Run a fast manual test on large result sets to confirm virtualization remains smooth.


591-603: NLog family 6.0.3 — consistent with Core.
Versions align with other projects; good.


675-677: System.Diagnostics.EventLog 9.0.8 — check event logging path.
If Flow writes to EventLog, validate entries still appear and no permission regressions on Win11.


679-685: System.Drawing.Common shows as 7.0.0 while Svg depends on 4.5.1.
NuGet will unify to a single version for net9; still, please run the app and watch for System.Drawing binding warnings.


840-849: FSharp.Core 9.0.303 cascades here too.
Version alignment with Core confirmed. LGTM.


862-865: Infra dependencies updated (NLog/SharpVectors) — parity with Core.
Good consistency across projects.


872-873: JetBrains.Annotations 2025.2.1 — consistent across plugin/core.
No runtime effect; fine.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Nitpick comments (2)
Flow.Launcher.Core/Flow.Launcher.Core.csproj (1)

4-4: Consider aligning the OS TFM with the app (optional).

Core targets net9.0-windows (defaults to windows7.0), while the app lockfile targets net9.0-windows10.0.19041. Unifying avoids accidental usage of older Windows API baselines.

Apply if desired:

-    <TargetFramework>net9.0-windows</TargetFramework>
+    <TargetFramework>net9.0-windows10.0.19041</TargetFramework>
Flow.Launcher/packages.lock.json (1)

4-4: Ensure consistent minimum Windows version across all TFMs.
net9.0-windows defaults to Windows 7.0, whereas Flow.Launcher, Flow.Launcher.Test and the Program plugin explicitly target Windows 10.0.19041.0—align every project’s <TargetFramework> to your intended baseline (e.g. net9.0-windows10.0.19041.0).

📜 Review details

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

💡 Knowledge Base configuration:

  • MCP integration is disabled by default for public repositories
  • Jira integration is disabled by default for public repositories
  • Linear integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.

📥 Commits

Reviewing files that changed from the base of the PR and between 6e873ab and b501e52.

📒 Files selected for processing (6)
  • Flow.Launcher.Core/Flow.Launcher.Core.csproj (1 hunks)
  • Flow.Launcher.Core/packages.lock.json (4 hunks)
  • Flow.Launcher.Infrastructure/packages.lock.json (5 hunks)
  • Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj (2 hunks)
  • Flow.Launcher.Plugin/packages.lock.json (1 hunks)
  • Flow.Launcher/packages.lock.json (11 hunks)
🚧 Files skipped from review as they are similar to previous changes (3)
  • Flow.Launcher.Plugin/packages.lock.json
  • Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
  • Flow.Launcher.Infrastructure/packages.lock.json
🧰 Additional context used
🧠 Learnings (2)
📚 Learning: 2024-10-08T15:52:58.573Z
Learnt from: taooceros
PR: Flow-Launcher/Flow.Launcher#2616
File: Flow.Launcher/Flow.Launcher.csproj:7-7
Timestamp: 2024-10-08T15:52:58.573Z
Learning: In the Flow Launcher project, the version number in the `Flow.Launcher.csproj` file is dynamically updated during the CI/CD process.

Applied to files:

  • Flow.Launcher.Core/Flow.Launcher.Core.csproj
  • Flow.Launcher/packages.lock.json
  • Flow.Launcher.Core/packages.lock.json
📚 Learning: 2025-09-04T11:52:29.074Z
Learnt from: jjw24
PR: Flow-Launcher/Flow.Launcher#3932
File: Flow.Launcher.Core/ExternalPlugins/PluginsManifest.cs:48-55
Timestamp: 2025-09-04T11:52:29.074Z
Learning: In Flow Launcher's PluginsManifest.cs, when dealing with version parsing for the MinimumAppVersion feature, maintainer jjw24 prefers to keep the solution simple rather than implementing comprehensive helper methods for SemVer parsing normalization.

Applied to files:

  • Flow.Launcher/packages.lock.json
  • Flow.Launcher.Core/packages.lock.json
🪛 GitHub Check: Check Spelling
Flow.Launcher.Core/packages.lock.json

[warning] 210-210:
NLog is not a recognized word. (unrecognized-spelling)


[warning] 205-205:
NLog is not a recognized word. (unrecognized-spelling)

⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (1)
  • GitHub Check: build
🔇 Additional comments (6)
Flow.Launcher.Core/Flow.Launcher.Core.csproj (2)

58-59: Minor bumps look good; lock file is in sync.

FSharp.Core → 9.0.303 and Meziantou.Framework.Win32.Jobs → 3.4.4 are safe minor updates and match the lock file.


15-15: Ensure CI enforces locked-mode restores
RestorePackagesWithLockFile is enabled; confirm your CI pipeline runs:

dotnet restore --locked-mode

to detect drift between your lock file and your project.

Flow.Launcher.Core/packages.lock.json (2)

16-25: Lockfile deltas are consistent with csproj and transitive graph.

  • FSharp.Core 9.0.303 and Meziantou 3.4.4 match csproj.
  • JetBrains.Annotations updated to 2025.2.2 across graph.
  • NLog + OutputDebugString to 6.0.3 and SharpVectors.Wpf to 1.8.5 look coherent.

Also applies to: 91-96, 200-217, 262-273


1-277: Verify solution restores and inspect outdated packages
Manually run dotnet restore --locked-mode and dotnet list package --outdated locally to confirm no drift or pre-release dependencies.

Flow.Launcher/packages.lock.json (2)

19-22: Broad minor updates look consistent; no obvious breaking changes.

  • Microsoft.Extensions.* to 9.0.8 is coherent (Hosting, DI, Logging, etc.).
  • VirtualizingWrapPanel 2.3.1, Fody 6.9.3, NLog 6.0.3, SharpVectors.Wpf 1.8.5, System.Diagnostics.EventLog 9.0.8 align across projects.
  • Core/Infra/Plugin project blocks reference the same versions as individual project lockfiles.

Also applies to: 72-110, 155-160, 197-201, 250-254, 591-603, 610-613, 673-677, 840-849, 862-865, 872-873


111-160: System.Drawing.Common resolves to a single version (7.0.0). Lock file shows only one library entry for System.Drawing.Common (7.0.0), satisfying the 4.5.1 and 4.7.0 constraints. No further action required—just monitor assembly binding if using image APIs.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

📜 Review details

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between b501e52 and 8bc60e5.

📒 Files selected for processing (4)
  • Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj (2 hunks)
  • Flow.Launcher/Flow.Launcher.csproj (3 hunks)
  • Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj (2 hunks)
  • Plugins/Flow.Launcher.Plugin.Explorer/Flow.Launcher.Plugin.Explorer.csproj (2 hunks)
🚧 Files skipped from review as they are similar to previous changes (3)
  • Plugins/Flow.Launcher.Plugin.Explorer/Flow.Launcher.Plugin.Explorer.csproj
  • Flow.Launcher/Flow.Launcher.csproj
  • Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
🧰 Additional context used
🧠 Learnings (2)
📚 Learning: 2024-10-08T15:52:58.573Z
Learnt from: taooceros
PR: Flow-Launcher/Flow.Launcher#2616
File: Flow.Launcher/Flow.Launcher.csproj:7-7
Timestamp: 2024-10-08T15:52:58.573Z
Learning: In the Flow Launcher project, the version number in the `Flow.Launcher.csproj` file is dynamically updated during the CI/CD process.

Applied to files:

  • Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj
📚 Learning: 2025-09-04T11:52:29.074Z
Learnt from: jjw24
PR: Flow-Launcher/Flow.Launcher#3932
File: Flow.Launcher.Core/ExternalPlugins/PluginsManifest.cs:48-55
Timestamp: 2025-09-04T11:52:29.074Z
Learning: In Flow Launcher's PluginsManifest.cs, when dealing with version parsing for the MinimumAppVersion feature, maintainer jjw24 prefers to keep the solution simple rather than implementing comprehensive helper methods for SemVer parsing normalization.

Applied to files:

  • Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (1)
  • GitHub Check: build
🔇 Additional comments (2)
Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj (2)

107-107: All localization references consistent
All plugin projects now reference Flow.Launcher.Localization version 0.0.5—no mismatches detected, so no further changes needed.


109-109: Verify Svg.Skia’s SkiaSharp dependency resolution
Unable to run dotnet list … --include-transitive in this sandbox—manually confirm that Svg.Skia 3.0.6 and your project’s SkiaSharp (3.119.0) converge to the same native assets to avoid load-time conflicts.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1 min review bug Something isn't working dependencies Pull requests that update a dependency file enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants