Skip to content

Merge v1.4 to main - #1106

Closed
AArnott wants to merge 1 commit into
mainfrom
merge-v1.4-to-main
Closed

AArnott wants to merge 1 commit into
mainfrom
merge-v1.4-to-main

Conversation

@AArnott

@AArnott AArnott commented Oct 7, 2026

Copy link
Copy Markdown
Owner

Forward-merge of v1.4 into main, bringing the Color.Empty fix (#1103) released in v1.4.82.

* Preserve Color.Empty when serializing

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Keep nullable Color values distinct

Use a boolean marker for Color.Empty so nullable null remains nil, and cover nullable color schemas across dialects.\n\nCo-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

* Record nullable Color schemas

Make nullable schema composition tolerate overlapping null branches and record the generated Color schemas for both dialects.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot AI balanced review requested due to automatic review settings October 7, 2026 15:00
@AArnott
AArnott enabled auto-merge October 7, 2026 15:00

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🟡 Changes recommended

The newly introduced rejection path for a boolean true color marker lacks regression coverage.

1 open finding
What changed in this PR

Forward-merges the v1.4.82 Color.Empty preservation fix into main.

Changes:

  • Encodes Color.Empty as false, preserving nullable nil.
  • Updates nullability-aware schemas and documentation.
  • Adds round-trip and schema regression coverage.
File Description
src/​Nerdbank.MessagePack/​Converters/​BclConverters.cs Implements the new color encoding.
src/​Nerdbank.MessagePack/​MessagePackConverter\1.cs` Handles nullable composed schemas.
test/​Nerdbank.MessagePack.TUnit/​BuiltInConverterTests.cs Tests color round trips.
test/​Nerdbank.MessagePack.TUnit/​SchemaTests.cs Tests nullable color schemas.
test/​.../​Draft4/​NullableColorSchema.schema.json Records Draft 4 color schema.
test/​.../​Draft4/​SubTypeSchema.schema.json Updates expected composition.
test/​.../​Draft4/​Surrogates.schema.json Updates expected composition.
test/​.../​Draft2020_12/​NullableColorSchema.schema.json Records Draft 2020-12 color schema.
test/​.../​Draft2020_12/​SubTypeSchema.schema.json Updates expected composition.
test/​.../​Draft2020_12/​Surrogates.schema.json Updates expected composition.
docfx/​docs/​built-in-converters.md Documents the color wire representation.

🧠 Review effort: Balanced


💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

Comment thread src/Nerdbank.MessagePack/Converters/BclConverters.cs
@codecov

codecov Bot commented Oct 7, 2026 •

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 94.59459% with 2 lines in your changes missing coverage. Please review.
✅ Project coverage is 82.85%. Comparing base (7ea3507) to head (f09460f).
⚠️ Report is 4 commits behind head on main.

Files with missing lines Patch % Lines
...c/Nerdbank.MessagePack/Converters/BclConverters.cs 84.61% 1 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1106      +/-   ##
==========================================
+ Coverage   82.80%   82.85%   +0.05%     
==========================================
  Files         259      259              
  Lines       21296    21327      +31     
  Branches     2810     2814       +4     
==========================================
+ Hits        17634    17671      +37     
+ Misses       2762     2756       -6     
  Partials      900      900              
Flag Coverage Δ
Linux 82.41% <94.59%> (+0.02%) ⬆️
Windows 82.58% <94.59%> (+0.07%) ⬆️
macOS 82.28% <94.59%> (+0.04%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@AArnott

AArnott commented Oct 7, 2026

Copy link
Copy Markdown
Owner Author

Closing: we only forward-merge v1.4 into main when actively working in main or right before a release from it.

@AArnott AArnott closed this Oct 7, 2026
auto-merge was automatically disabled October 7, 2026 15:19

Pull request was closed

@AArnott
AArnott deleted the merge-v1.4-to-main branch October 7, 2026 15:19

This branch was successfully deployed

1 active deployment
Publishing — f09460fe Deployed Oct 7, 2026 by AArnott via release #84
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants