Normalize vendored zlib to upstream 1.2.11#1442
Merged
Merged
Conversation
Replace the checked-in SIMD-patched zlib sources with the upstream 1.2.11 implementation so the component manifest can reference the standard zlib commit instead of the old motley/Chromium-derived patch set. Files changed: - cgmanifest.json - third_party/cgmanifest.json - docs/List-of-OSS-Components.md - zlib/ Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Keep the legacy v142 project patch aligned with the cleaned upstream zlib sources so the generated project no longer adds removed SIMD files. Files changed: - tools/ports/mstelemetry/v142-build.patch Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
pablo-msft
previously approved these changes
May 19, 2026
pablo-msft
approved these changes
May 19, 2026
lalitb
reviewed
May 20, 2026
lalitb
approved these changes
May 20, 2026
Contributor
lalitb
left a comment
lalitb
left a comment
There was a problem hiding this comment.
Nice work. Thanks for the cleanup. As a follow-up, it may be worth considering whether the Windows build can move to zlib from vcpkg instead of continuing to carry a checked-in snapshot, so it is easier to stay current in the future.
Contributor
Author
|
Yes, will use zlib via vcpkg in my vcpkg PR |
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
3 participants
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.
Summary
cgmanifest.jsonto reference the upstream zlib v1.2.11 commit.This is intended as a follow-up into #1439 /
user/pablo/cgso the CGManifest describes a standard zlib snapshot instead of the old patched tree.Validation
MSBuild.exe Solutions\MSTelemetrySDK.sln /target:zlib:Rebuild /p:BuildProjectReferences=true /p:Configuration=Release /p:Platform=x64 /p:PlatformToolset=v145 /verbosity:minimalMSBuild.exe Solutions\MSTelemetrySDK.sln /target:sqlite:Rebuild,zlib:Rebuild,Tests\gmock:Rebuild,Tests\gtest:Rebuild,Tests\UnitTests:Rebuild /p:BuildProjectReferences=true /p:Configuration=Release /p:Platform=x64 /p:PlatformToolset=v145 /verbosity:minimalUnitTests.exe --gtest_color=no(460 passed)MSBuild.exe Solutions\MSTelemetrySDK.sln /target:Tests\FuncTests:Rebuild /p:BuildProjectReferences=true /p:Configuration=Release /p:Platform=x64 /p:PlatformToolset=v145 /verbosity:minimalFuncTests.exe --gtest_color=no(45 passed)-DLINK_STATIC_DEPENDS=OFF -DBUILD_SHARED_LIBS=OFFUnitTests(496 passed)FuncTests --gtest_filter=-APITest.C_API_Test(38 passed)