镜像站点 · 本页由第三方 GitHub 只读镜像提供,非 GitHub 官方站点,不接受任何登录或凭据输入。前往 github.com
Skip to content

Correct Libraries third-party notices in runtime distributions - #136959

Merged
jeffhandley merged 1 commit into
dotnet:mainfrom
krwq:krwq-runtime-notice-fixes
Nov 6, 2026
Merged

jeffhandley merged 1 commit into
dotnet:mainfrom
krwq:krwq-runtime-notice-fixes

Conversation

@krwq

@krwq krwq commented Nov 4, 2026

Copy link
Copy Markdown
Member

Note

This pull request was generated with AI assistance. Please review before merging.

These omissions were identified during a third-party license review for the sign-off process.

Add missing Libraries and ICU attributions to the existing package and installed-product notice inputs. Reuse the existing Unicode grant without duplication, preserve existing license wording, and limit copyright corrections to dates supported by included source.

Validation: 86 focused notice composition, duplicate, provenance, and packaging-delivery checks passed; git diff --check passed. Notice data only; no runtime rebuild was performed.

Add missing Libraries and ICU attributions to the package and
installed-product notice inputs. Reuse shared notices and preserve
existing terms with source-backed copyright corrections.

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

Copy link
Copy Markdown
Member

/ba-g No pipelines are applicable

@jeffhandley
jeffhandley merged commit ed70a9a into dotnet:main Nov 6, 2026
6 of 8 checks passed
@krwq

krwq commented Nov 6, 2026

Copy link
Copy Markdown
Member Author

/backport to release/11.0

@github-actions

github-actions Bot commented Nov 6, 2026

Copy link
Copy Markdown
Contributor

Started backporting to release/11.0 (link to workflow run)

@krwq

krwq commented Nov 6, 2026

Copy link
Copy Markdown
Member Author

/backport to release/10.0

@krwq

krwq commented Nov 6, 2026

Copy link
Copy Markdown
Member Author

/backport to release/9.0-staging

@krwq

krwq commented Nov 6, 2026

Copy link
Copy Markdown
Member Author

/backport to release/8.0-staging

@github-actions

github-actions Bot commented Nov 6, 2026

Copy link
Copy Markdown
Contributor

Started backporting to release/10.0 (link to workflow run)

@github-actions

github-actions Bot commented Nov 6, 2026

Copy link
Copy Markdown
Contributor

Started backporting to release/9.0-staging (link to workflow run)

@github-actions

github-actions Bot commented Nov 6, 2026

Copy link
Copy Markdown
Contributor

Started backporting to release/8.0-staging (link to workflow run)

@github-actions

github-actions Bot commented Nov 6, 2026

Copy link
Copy Markdown
Contributor

@krwq backporting to release/9.0-staging failed, the patch most likely resulted in conflicts. Please backport manually!

git am output
$ git cherry-pick ed70a9a38ddb795460822e15b4b0707a3970ba9d

Auto-merging THIRD-PARTY-NOTICES.TXT
Auto-merging src/installer/pkg/THIRD-PARTY-NOTICES.TXT
CONFLICT (content): Merge conflict in src/installer/pkg/THIRD-PARTY-NOTICES.TXT
error: could not apply ed70a9a38dd... Correct Libraries third-party notices in runtime distributions (#136959)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"


$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: Correct runtime third-party notices
Using index info to reconstruct a base tree...
M	THIRD-PARTY-NOTICES.TXT
M	src/installer/pkg/THIRD-PARTY-NOTICES.TXT
Falling back to patching base and 3-way merge...
Auto-merging THIRD-PARTY-NOTICES.TXT
Auto-merging src/installer/pkg/THIRD-PARTY-NOTICES.TXT
CONFLICT (content): Merge conflict in src/installer/pkg/THIRD-PARTY-NOTICES.TXT
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Correct runtime third-party notices
Error: The process '/usr/bin/git' failed with exit code 128

Link to workflow output

@github-actions

github-actions Bot commented Nov 6, 2026

Copy link
Copy Markdown
Contributor

@krwq backporting to release/10.0 failed, the patch most likely resulted in conflicts. Please backport manually!

git am output
$ git cherry-pick ed70a9a38ddb795460822e15b4b0707a3970ba9d

Auto-merging THIRD-PARTY-NOTICES.TXT
Auto-merging src/installer/pkg/THIRD-PARTY-NOTICES.TXT
CONFLICT (content): Merge conflict in src/installer/pkg/THIRD-PARTY-NOTICES.TXT
error: could not apply ed70a9a38dd... Correct Libraries third-party notices in runtime distributions (#136959)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"


$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: Correct runtime third-party notices
Using index info to reconstruct a base tree...
M	THIRD-PARTY-NOTICES.TXT
M	src/installer/pkg/THIRD-PARTY-NOTICES.TXT
Falling back to patching base and 3-way merge...
Auto-merging THIRD-PARTY-NOTICES.TXT
Auto-merging src/installer/pkg/THIRD-PARTY-NOTICES.TXT
CONFLICT (content): Merge conflict in src/installer/pkg/THIRD-PARTY-NOTICES.TXT
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Correct runtime third-party notices
Error: The process '/usr/bin/git' failed with exit code 128

Link to workflow output

@github-actions

github-actions Bot commented Nov 6, 2026

Copy link
Copy Markdown
Contributor

@krwq backporting to release/8.0-staging failed, the patch most likely resulted in conflicts. Please backport manually!

git am output
$ git cherry-pick ed70a9a38ddb795460822e15b4b0707a3970ba9d

Auto-merging THIRD-PARTY-NOTICES.TXT
CONFLICT (content): Merge conflict in THIRD-PARTY-NOTICES.TXT
Auto-merging src/installer/pkg/THIRD-PARTY-NOTICES.TXT
CONFLICT (content): Merge conflict in src/installer/pkg/THIRD-PARTY-NOTICES.TXT
error: could not apply ed70a9a38dd... Correct Libraries third-party notices in runtime distributions (#136959)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"


$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: Correct runtime third-party notices
Using index info to reconstruct a base tree...
M	THIRD-PARTY-NOTICES.TXT
M	src/installer/pkg/THIRD-PARTY-NOTICES.TXT
Falling back to patching base and 3-way merge...
Auto-merging THIRD-PARTY-NOTICES.TXT
CONFLICT (content): Merge conflict in THIRD-PARTY-NOTICES.TXT
Auto-merging src/installer/pkg/THIRD-PARTY-NOTICES.TXT
CONFLICT (content): Merge conflict in src/installer/pkg/THIRD-PARTY-NOTICES.TXT
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Correct runtime third-party notices
Error: The process '/usr/bin/git' failed with exit code 128

Link to workflow output

@dotnet-milestone-bot dotnet-milestone-bot Bot added this to the 12.0-preview1 milestone Nov 6, 2026
krwq added a commit that referenced this pull request Nov 9, 2026
…ibutions (#137078)

> [!NOTE]
> This pull request was generated with AI assistance. Please review
before merging.

Backport of [#136959](#136959) to
release/10.0

/cc @krwq

Fixes Issue <!-- Issue Number --> N/A

main PR <!-- Link to PR if any that fixed this in the main branch. -->
[#136959](#136959)

# Description

<!-- Give a brief summary of the issue and how the pull request is
fixing it. -->

These omissions were identified during a third-party license review. Add
missing Libraries and applicable ICU attributions to the existing
package and installed-product notices, preserving existing license
wording and using source included on release/10.0.

# Customer Impact

<!-- What is the impact to customers of not taking this fix? -->

- [ ] Customer reported
- [x] Found internally

Some .NET 10 distributions omit notices for included third-party code
and data. This corrects the notice inputs without changing runtime
behavior.

# Regression

<!-- Is this fixing a problem that was introduced in the most recent
release, ie., fixing a regression? -->

- [ ] Yes
- [x] No

This corrects existing attribution gaps, not a functional regression.

# Testing

<!-- What kind of testing has been done with the fix. -->

Using session-local validation artifacts, with `NOTICE_REPO` set to the
backport checkout:

- `python validate-notices-10.py --repo "%NOTICE_REPO%" --output
runtime-notice-validation-10.json --unicode-source
Unicode-16.0-CaseFolding.txt`: passed 90/90 notice composition,
duplicate, branch-source provenance, and delivery-path checks.
- `python .\verify-pinned-icu.py`: passed pinned ICU license,
compiled-input, filter, and data-container checks.
- `git --no-pager diff --check
c17ac3c`: passed.

Notice data only; no runtime rebuild was performed.

# Risk

<!-- Please assess the risk of taking this fix. Provide details backing
up your assessment. -->

Low: only the two notice text files change. Existing license wording and
delivery wiring are preserved. Copyright corrections and additions are
source-backed; the .NET 11-only Intel decimal attribution is excluded.

# Package authoring no longer needed in .NET 9

IMPORTANT: Starting with .NET 9, you no longer need to edit a NuGet
package's csproj to enable building and bump the version.
Keep in mind that we still need package authoring in .NET 8 and older
versions.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
krwq added a commit that referenced this pull request Nov 9, 2026
…ibutions (#137070)

> [!NOTE]
> This pull request was generated with AI assistance. Please review
before merging.

Backport of [#136959](#136959) to
release/11.0

/cc @krwq

## Customer Impact

- [ ] Customer reported
- [x] Found internally

Required third-party attributions were missing or incomplete in the
installed-product and packaged-runtime notices. This notice-only
backport corrects coverage for included Libraries code and redistributed
ICU components.

## Regression

- [ ] Yes
- [x] No (no code changes, license was not updated around ~8.0 time
period)

The change corrects notice coverage without changing runtime behavior.

## Testing

The main PR passed 86 focused notice checks. Both backported notice Git
blobs match the reviewed main content. The branch's Unicode 16 table
identity, affected compile inputs, and actual pinned ICU license/source
inventory were checked. No runtime build was performed.

## Risk

Low. Only notice text changes; no runtime code, API or packaging-wiring
changes.

**IMPORTANT**: If this backport is for a servicing release, please
verify that:

- For .NET 8 and .NET 9: The PR target branch is `release/X.0-staging`,
not `release/X.0`.
- For .NET 10+: The PR target branch is `release/X.0` (no `-staging`
suffix).

## Package authoring no longer needed in .NET 9

**IMPORTANT**: Starting with .NET 9, you no longer need to edit a NuGet
package's csproj to enable building and bump the version.
Keep in mind that we still need package authoring in .NET 8 and older
versions.

Co-authored-by: Krzysztof Wicher <kwicher@microsoft.com>
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants