Jaap Taal
72e0be1031
[csharp] Fix indentation for MapField with nested Messages ( #15836 )
...
WriteDictionary does not pass indentationLevel downwards to WriteValue. The existing test for `MapField` only tests `MapField<string, string>`, which isn't affected by the issue.
Tests are added for this issue.
Note: I also added `WriteValueWithIndentation_MapWithEmptyNested` to ensure this change would break things, but I doubt if it's necessary. Let me know whether to remove it.
Closes #15836
COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/15836 from q42jaap:main 2b9399ba0c
PiperOrigin-RevId: 607000434
1 year ago
Protobuf Team Bot
6efaf1db54
Auto-generate files after cl/606786933
1 year ago
aiuto
3ab1276bbb
Update Bazel references to rules_pkg to the supported file locations. ( #15780 )
...
WIP: I want to see this pass CI first.
Fixes : #15779
3 scripted transforms:
```
-load("@rules_pkg//:mappings.bzl", ...)
+load("@rules_pkg//pkg:mappings.bzl", ...)
```
```
-load("@rules_pkg//:pkg.bzl", "pkg_tar")
+load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
```
```
-load("@rules_pkg//:pkg.bzl", "pkg_zip")
+load("@rules_pkg//pkg:zip.bzl", "pkg_zip")
```
Closes #15780
COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/15780 from aiuto:rules_pkg a630276341
PiperOrigin-RevId: 606641398
1 year ago
Protobuf Team Bot
55e50ba406
C#: Ignore invalid enum string values in JSON, when invalid fields are being ignored.
...
PiperOrigin-RevId: 605310357
1 year ago
Protobuf Team Bot
4767a309d3
Auto-generate files after cl/605097398
1 year ago
Protobuf Team Bot
41732e8fee
Auto-generate files after cl/604457261
1 year ago
Chris Kennelly
34a04c1fd5
Remove lazy=true from repeated fields.
...
This is currently a no-op in protoc.
PiperOrigin-RevId: 604457261
1 year ago
Anton Grbin
a5e10aff2b
[C#] Conformance test: don't skip JsonIgnoreUnknownParsingTest in runner ( #15369 )
...
# Motivation
https://github.com/protocolbuffers/protobuf/issues/7392#issuecomment-1884666885
This is for completeness - I am not blocked by this change in any way, so feel free to close the PR or treat is a low priority.
# Changes
Implement JsonIgnoreUnknownParsingTest in C# conformance test runner.
# Tested
Locally with:
```
bazel test //csharp:conformance_test \
--action_env=DOTNET_CLI_TELEMETRY_OPTOUT=1 --test_env=DOTNET_CLI_HOME=~ \
--action_env=DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1
```
Closes #15369
COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/15369 from noom:issue-7392/show-csharp-failures 3a652202a0
PiperOrigin-RevId: 602537927
1 year ago
Dennis Shao
9146ce6ddb
Updating version.json and repo version numbers to: 27-dev ( #15590 )
...
Closes #15590
PiperOrigin-RevId: 601468713
1 year ago
Austin Wise
48c80e46bb
Fix setting of environmental variables in build_release.sh
...
PiperOrigin-RevId: 601316979
1 year ago
Protobuf Team Bot
3d79d0374b
Auto-generate files after cl/599369761
1 year ago
Protobuf Team Bot
27af4c802f
Auto-generate files after cl/599220883
1 year ago
Protobuf Team Bot
41c8f2a5c6
Auto-generate files after cl/597378801
1 year ago
Protobuf Team Bot
55260d8321
Auto-generate files after cl/596018472
1 year ago
Protobuf Team Bot
79cc57bf57
Auto-generate files after cl/594312823
1 year ago
Protobuf Team Bot
e0b3610e7f
Auto-generate files after cl/594261739
1 year ago
Protobuf Team Bot
8981fe5cab
Auto-generate files after cl/592677762
1 year ago
James Newton-King
ec1fd2700e
[C#] Fix trimming warning in JSON formatter enum handling ( #14789 )
...
There is a new trimming/AOT warning in JSON formatter enum handling. I have fixed it by suppressing the value.
I also tested the solution with the .NET 8 SDK and suppressed some other warnings that came up (they're already handled).
It would be great to include this fix in a 25.x release.
Closes #14789
COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/14789 from JamesNK:jamesnk/enum-trimming-warning d64dda15f0
PiperOrigin-RevId: 592306588
1 year ago
Protobuf Team Bot
d159913c0d
Auto-generate files after cl/590998510
1 year ago
Protobuf Team Bot
4b2a30c22c
Slightly relax JSON integer parsing tests to handle a wider range of runtime behaviors around
...
parsing floating point values not exactly representable as the destination type.
PiperOrigin-RevId: 590739762
1 year ago
Protobuf Team Bot
de57b67561
Auto-generate files after cl/586781244
1 year ago
Protobuf Team Bot
4d31a3451b
Auto-generate files after cl/586756816
1 year ago
Protobuf Team Bot
43a950bfa6
Auto-generate files after cl/586448719
1 year ago
Protobuf Team Bot
5b8b87f3f7
Auto-generate files after cl/586204703
1 year ago
Protobuf Team Bot
b41f04d42a
Auto-generate files after cl/583411456
1 year ago
marner2
c1e0853f70
Fix csharp fieldmasktree merge null checking ( #12737 )
...
Fixes #12685 for CSharp, but the Java equivalent probably has the same bug.
Closes #12737
COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/12737 from marner2:fix_csharp_fieldmasktree_merge_null_checking 78c7812ac3
PiperOrigin-RevId: 579314424
1 year ago
Jie Luo
1231af10c7
merge 25.x to main ( #14617 )
...
Closes #14617
COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/14617 from anandolee:25.x ac86c5ef32
PiperOrigin-RevId: 578996979
1 year ago
Protobuf Team Bot
3ea774370a
Internal change
...
PiperOrigin-RevId: 578944754
1 year ago
Protobuf Team Bot
6b5d8db01f
Updating version.json and repo version numbers to: 25.0
1 year ago
Protobuf Team Bot
ba1aab2baf
Updating version.json and repo version numbers to: 25.0-rc2
1 year ago
Protobuf Team Bot
896f3d8ced
Updating version.json and repo version numbers to: 25.0-rc1
1 year ago
Protobuf Team Bot
4b301ad764
Auto-generate files after cl/573375994
1 year ago
Protobuf Team Bot
499dd1c3f4
Auto-generate files after cl/572264242
1 year ago
Protobuf Team Bot
ac5a13ce75
Update dependencies in C# test project.
...
PiperOrigin-RevId: 570922351
1 year ago
Protobuf Team Bot
c04b501e7c
Auto-generate files after cl/570746314
1 year ago
Protobuf Team Bot
6703802f20
Auto-generate files after cl/570576252
1 year ago
James Newton-King
68fce2e22a
Use ConcurrentDictionary in JsonFormatter ( #14272 )
...
I have a theory that the lock in `JsonFormatter` periodically causes this VS debugging error for Protobuf types:

Hopefully `ConcurrentDictionary` resolves this issue. Even if it doesn't, this change still resolves the TODO so this is a good improvement.
Closes #14272
COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/14272 from JamesNK:jamesnk/concurrentdictionary 6ec3ebc2f6
PiperOrigin-RevId: 570439102
1 year ago
Protobuf Team Bot
206583d39b
Auto-generate files after cl/568927357
1 year ago
Adam Cozzette
501ececd39
Reorganize upb file structure
...
This change moves almost everything in the `upb/` directory up one level, so
that for example `upb/upb/generated_code_support.h` becomes just
`upb/generated_code_support.h`. The only exceptions I made to this were that I
left `upb/cmake` and `upb/BUILD` where they are, mostly because that avoids
conflict with other files and the current locations seem reasonable for now.
The `python/` directory is a little bit of a challenge because we had to merge
the existing directory there with `upb/python/`. I made `upb/python/BUILD` into
the BUILD file for the merged directory, and it effectively loads the contents
of the other BUILD file via `python/build_targets.bzl`, but I plan to clean
this up soon.
PiperOrigin-RevId: 568651768
1 year ago
Protobuf Team Bot
61127956a7
Auto-generate files after cl/568621264
1 year ago
Protobuf Team Bot
ab58f8fbab
Auto-generate files after cl/568554147
1 year ago
Lydon Chandra
96100bf1e4
add C# deterministic serialization ( #13160 )
...
https://github.com/protocolbuffers/protobuf/issues/12881
@jskeet review please :-) as this is my first contrib to protobuf, any design / performance feedback is very sought after
Closes #13160
COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/13160 from fmg-lydonchandra:feature/12881_cs_serialization_deterministic ab7e01b804
PiperOrigin-RevId: 568448399
1 year ago
James Newton-King
67b9c76752
Add .NET debugging attributes ( #14097 )
...
I've been working with a large Protobuf model and noticed debugging issues that can easily be improved.
Add debugging attributes to collections, `ByteString`, and descriptors. No impact on runtime behavior. Debugger type proxies are what the debugger displays by default, but full data is available by selecting "Raw View".
`RepeatedField` and `MapField` now display their item count. This is standard across .NET collections. For example, .NET's list and dictionary both display `Count = {Count}`.
Note that previously, Protobuf collections displayed the result of `ToString`, which returned JSON. The JSON debug view isn't useful when there is too much content to display at once because it's truncated. That experience will be fairly common.
Count benefits:
* Always useful
* Makes debugging Protobuf collections feel more like regular .NET collections
* Collection contents is now easier to access with debugger type proxies
No dependency between this PR and https://github.com/protocolbuffers/protobuf/pull/13838 . Each can be merged independently.
**MapField before:**

**MapField after:**

**RepeatedField before:**

**RepeatedField after:**

**ByteString before:**

**ByteString after:**

**Descriptor before:**

**Descriptor after:**

**TypeRegistry before:**

**TypeRegistry after:**

Closes #14097
COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/14097 from JamesNK:jamesnk/debugging f0dea3464d
PiperOrigin-RevId: 568444117
1 year ago
Protobuf Team Bot
2babd72727
Auto-generate files after PR #13838
1 year ago
Protobuf Team Bot
986cbb647b
Auto-generate files after cl/566628155
1 year ago
Sandy Zhang
81068e8e8c
Internal change
...
PiperOrigin-RevId: 566426899
1 year ago
Protobuf Team Bot
cc84eba821
Auto-generate files after cl/564534891
1 year ago
Joshua Haberman
f4f73699b0
Shorten our license headers into an abbreviated form that references LICENSE instead of including it in full.
...
PiperOrigin-RevId: 564534891
1 year ago
Joshua Haberman
9d27c2f8aa
Shorten our license headers into an abbreviated form that references LICENSE instead of including it in full.
...
PiperOrigin-RevId: 564518438
1 year ago
Protobuf Team Bot
45ed02805f
Auto-generate files after cl/564489381
1 year ago