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
1 year ago
1231af10c7
merge 25.x to main ( #14617 )
...
Closes #14617
COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/14617 from anandolee:25.x ac86c5ef32
1 year ago
3ea774370a
Internal change
...
PiperOrigin-RevId: 578944754
1 year ago
6b5d8db01f
Updating version.json and repo version numbers to: 25.0
1 year ago
ba1aab2baf
Updating version.json and repo version numbers to: 25.0-rc2
1 year ago
896f3d8ced
Updating version.json and repo version numbers to: 25.0-rc1
1 year ago
4b301ad764
Auto-generate files after cl/573375994
1 year ago
499dd1c3f4
Auto-generate files after cl/572264242
1 year ago
ac5a13ce75
Update dependencies in C# test project.
...
PiperOrigin-RevId: 570922351
1 year ago
c04b501e7c
Auto-generate files after cl/570746314
1 year ago
6703802f20
Auto-generate files after cl/570576252
1 year ago
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
1 year ago
206583d39b
Auto-generate files after cl/568927357
1 year ago
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
61127956a7
Auto-generate files after cl/568621264
1 year ago
ab58f8fbab
Auto-generate files after cl/568554147
1 year ago
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
1 year ago
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
1 year ago
2babd72727
Auto-generate files after PR #13838
1 year ago
986cbb647b
Auto-generate files after cl/566628155
1 year ago
81068e8e8c
Internal change
...
PiperOrigin-RevId: 566426899
1 year ago
cc84eba821
Auto-generate files after cl/564534891
1 year ago
f4f73699b0
Shorten our license headers into an abbreviated form that references LICENSE instead of including it in full.
...
PiperOrigin-RevId: 564534891
1 year ago
9d27c2f8aa
Shorten our license headers into an abbreviated form that references LICENSE instead of including it in full.
...
PiperOrigin-RevId: 564518438
1 year ago
45ed02805f
Auto-generate files after cl/564489381
1 year ago
dfc8445c72
Auto-generate files after cl/564457642
1 year ago
b106bb2abc
Auto-generate files after cl/564014227
1 year ago
da40ff6fb1
Shorten our license headers into an abbreviated form that references LICENSE instead of including it in full.
...
PiperOrigin-RevId: 564015858
1 year ago
296ae4e663
Shorten our license headers into an abbreviated form that references LICENSE instead of including it in full.
...
PiperOrigin-RevId: 564014227
1 year ago
db20f5ffc9
Shorten our license headers into an abbreviated form that references LICENSE instead of including it in full.
...
PiperOrigin-RevId: 564013990
1 year ago
638a860285
Shorten our license headers into an abbreviated form that references LICENSE instead of including it in full.
...
PiperOrigin-RevId: 563893662
1 year ago
8c05a64f10
Shorten our license headers into an abbreviated form that references LICENSE instead of including it in full.
...
PiperOrigin-RevId: 563888984
1 year ago
106de22416
Shorten our license headers into an abbreviated form that references LICENSE instead of including it in full.
...
PiperOrigin-RevId: 563888974
1 year ago
8c45177016
Shorten our license headers into an abbreviated form that references LICENSE instead of including it in full.
...
PiperOrigin-RevId: 563888972
1 year ago
95d3a2f097
Shorten our license headers into an abbreviated form that references LICENSE instead of including it in full.
...
PiperOrigin-RevId: 563888964
1 year ago
e11db6ae6c
Shorten our license headers into an abbreviated form that references LICENSE instead of including it in full.
...
PiperOrigin-RevId: 563888963
1 year ago
1438cc8931
Shorten our license headers into an abbreviated form that references LICENSE instead of including it in full.
...
PiperOrigin-RevId: 563888943
1 year ago
50fc19229d
Shorten our license headers into an abbreviated form that references LICENSE instead of including it in full.
...
PiperOrigin-RevId: 563888930
1 year ago
77f8c4974c
Auto-generate files after cl/563791580
1 year ago
0e484c7777
Auto-generate files after cl/563175374
1 year ago
fa98bb316a
Auto-generate files after cl/561993644
1 year ago
2d67dc4b54
Auto-generate files after cl/559271634
1 year ago
9f45862162
Auto-generate files after cl/557972284
1 year ago
32ec0d5dbd
Auto-generate files after cl/557967343
1 year ago
76f9547ebc
Auto-generate files after cl/555615362
1 year ago
b359e5020a
Lock down ctype=CORD in proto file.
...
ctype can not be used for none string/bytes fields. ctye=CORD can not be used for extensions. A new macro PROTOBUF_FUTURE_REMOVE_WRONG_CTYPE is added that will be flipped for our next breaking release.
PiperOrigin-RevId: 555615362
1 year ago
843b74e601
Main 202308091812 ( #13489 )
...
Closes #13489
COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/13489 from protocolbuffers:main-202308091812 e729f0bf5a
1 year ago
aba9a7f1a3
Internal change
...
PiperOrigin-RevId: 555251853
1 year ago
093e258a71
Updating version.json and repo version numbers to: 24.0
1 year ago
3487ae0c01
Updating version.json and repo version numbers to: 24.0-rc3
1 year ago
marner2
Jie Luo
Protobuf Team Bot
Protobuf Team Bot
James Newton-King
Adam Cozzette
Lydon Chandra
Sandy Zhang
Joshua Haberman
Jie Luo
ericsalo