Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reduce shared store size on roll forward #2223

Merged

Conversation

pjanotti
Copy link
Contributor

@pjanotti pjanotti commented Feb 18, 2023

Why

Reduces the size of the shared store for net6.0

Fixes #2180

What

Update the deps.json to point to the roll forward TFM and delete the TFM directory that becomes unused.

Tests

Already covered via DotNetCliTests and Integration tests in general.

Checklist

- [] CHANGELOG.md is updated.
- [] Documentation is updated.
- [] New features are covered by tests.

@pjanotti pjanotti requested a review from a team February 18, 2023 02:51
@@ -499,41 +500,17 @@ void CopyNativeDependenciesToStore(AbsolutePath file, JsonDocument jsonDocument,
}
}

void RemoveDuplicatedLibraries(string depsJsonContent, IReadOnlyList<string> architectureStores)
{
var duplicatedLibraries = new List<(string Name, string Version)> { };
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Removed this function because due to this line, it was never deleting anything.

@pjanotti pjanotti closed this Feb 18, 2023
@pjanotti pjanotti reopened this Feb 18, 2023
@pjanotti pjanotti enabled auto-merge (squash) February 21, 2023 19:18
@pjanotti pjanotti merged commit c6720cd into open-telemetry:main Feb 21, 2023
@pjanotti pjanotti deleted the optiomize-shared-store-roll-forward branch June 2, 2023 20:00
Kielek added a commit that referenced this pull request Jun 15, 2023
partially revert RemoveDuplicatedLibraries functionality from #2223 and #1226
Kielek added a commit that referenced this pull request Jun 15, 2023
partially revert RemoveDuplicatedLibraries functionality from #2223 and #1226
Kielek added a commit that referenced this pull request Jun 15, 2023
…2654)

* Bump Microsoft.Extensions.Logging.Abstractions from 7.0.0 to 7.0.1

Bumps [Microsoft.Extensions.Logging.Abstractions](https://github.com/dotnet/runtime) from 7.0.0 to 7.0.1.
- [Release notes](https://github.com/dotnet/runtime/releases)
- [Commits](dotnet/runtime@v7.0.0...v7.0.1)

---
updated-dependencies:
- dependency-name: Microsoft.Extensions.Logging.Abstractions
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* Fix build process after upgrade
partially revert RemoveDuplicatedLibraries functionality from #2223 and #1226

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Piotr Kiełkowicz <[email protected]>
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.

Optimize the roll-forward on AdditionalDeps and SharedStore
4 participants