Fix latest ArgumentException for C# extensions #6938
Merged
Conversation
This file contains 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
ObsidianMinor
commented
Nov 24, 2019
| { | ||
| registry.AddRange(dependencies.SelectMany(GetAllDependedExtensions).Concat(GetAllGeneratedExtensions(generatedInfo)).ToArray()); | ||
| return dependencies.SelectMany(GetAllDependedExtensions).Distinct().Concat(GetAllGeneratedExtensions(generatedInfo)); |
There was a problem hiding this comment.
Should we get an enumerable over the files and run distinct on those so we don't duplicate work by loading the file's extensions multiple times?
ObsidianMinor
force-pushed
the
csharp/fix/6936
branch
from
c99925b
to
cd11d54
Compare
|
The MacOS Ruby test failure is a known one (thanks for fixing it so quickly btw). |
ObsidianMinor
force-pushed
the
csharp/fix/6936
branch
from
73e6ec2
to
145033c
Compare
jtattermusch
reviewed
Dec 3, 2019
csharp/generate_protos.sh
Outdated
| src/google/protobuf/unittest_well_known_types.proto \ | ||
| src/google/protobuf/test_messages_proto3.proto \ | ||
| src/google/protobuf/test_messages_proto2.proto | ||
| map_unittest_proto3.proto \ |
There was a problem hiding this comment.
why are you removing the prefix from the path? Looks unrelated to this PR.
There was a problem hiding this comment.
Please revert unnecessary changes.
|
distcheck is currently failing (see test results). |
jtattermusch
reviewed
Dec 3, 2019
jtattermusch
approved these changes
Dec 3, 2019
There was a problem hiding this comment.
LGTM once the tests pass.
@ObsidianMinor thanks for fixing the problem!
rafi-kamal
pushed a commit
that referenced
this pull request
Feb 7, 2020
Fix latest ArgumentException for C# extensions
rafi-kamal
added a commit
that referenced
this pull request
Feb 10, 2020
Fix latest ArgumentException for C# extensions Co-authored-by: Jan Tattermusch <jtattermusch@users.noreply.github.com>
owent
added a commit
to owent-contrib/protobuf
that referenced
this pull request
Apr 14, 2020
…eep the code to remove repeated depended files.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Adds a Distinct filter for extensions loaded from depended descriptors. Fixes #6936
cc: @jtattermusch @rafi-kamal