Commit Graph

986 Commits

Author SHA1 Message Date
Deanna Garcia
b7fe12e367 Syncing from internal 2022-02-01 21:30:49 +00:00
Deanna Garcia
ab4585a695 Sync from Piper @425656941
PROTOBUF_SYNC_PIPER
2022-02-01 18:24:53 +00:00
deannagarcia
c756e61878
Merge pull request #9430 from xoofx/fix-csharp-fielddesc-ispacked
Fixes NullReferenceException when accessing FieldDescriptor.IsPacked
2022-01-31 11:10:20 -08:00
Adam Cozzette
18521f6055 Merge branch '3.19.x' into merge-3.19.x 2022-01-28 17:42:21 +00:00
Jon Skeet
b926a7d209 Add ToProto() method to all C# descriptor classes
Fixes #9425.
2022-01-28 14:17:56 +00:00
Adam Cozzette
22d0e265de
Update protobuf version for 3.19.4 (#9449)
I also updated the PHP release notes in
php/ext/google/protobuf/package.xml.
2022-01-27 19:35:56 -08:00
Alexandre Mutel
16941420c9 Fixed NullReferenceException when accessing FieldDescriptor.IsPacked 2022-01-21 05:29:40 +01:00
Adam Cozzette
5bb34e9930 Merge branch '3.19.x' into merge-3.19.x 2022-01-11 18:07:17 +00:00
Adam Cozzette
cc7b1b5323 Update protobuf version 2022-01-10 18:08:15 -08:00
Adam Cozzette
eb94f17a8b Update protobuf version 2022-01-05 10:05:11 -08:00
James Newton-King
22462b0c52
Fix trim warnings 2021-11-17 14:01:25 +13:00
James Newton-King
4c09e43f74
Fix .NET SourceLink and warnings in NuGet package 2021-11-13 07:46:20 +13:00
James Newton-King
c685d79368
Fix test 2021-11-12 12:57:47 +13:00
James Newton-King
90afe0cfc6
Add nuget.config 2021-11-12 12:38:05 +13:00
James Newton-King
0f33dc4380
Fix tests 2021-11-10 09:02:28 +13:00
James Newton-King
aa15931050
Update .NET SDKs to LTS versions 2021-11-10 08:49:53 +13:00
Adam Cozzette
7ccf4d8f67
Merge pull request #9169 from protocolbuffers/3.19.x
Merge 3.19.x into master
2021-11-02 10:10:47 -07:00
Adam Cozzette
7c40b2df1f
Update protobuf version (#9167) 2021-10-28 14:07:53 -07:00
Chris Bainbridge
65852d6e9c
Fix comment syntax in any.proto (#8792)
* Fix comment syntax in any.proto

Remove extra spaces which cause incorrect indentation in godoc.
Remove the "====" style title which is not rendered by godoc.

* Run ./generate_descriptor_proto.sh
2021-10-27 11:28:21 -07:00
Adam Cozzette
9c3af64ae4
Update checked-in C# generated code (#9158)
This change fixes the test that verifies that the checked-in generated
code for descriptor.proto is up to date.
2021-10-26 14:31:46 -07:00
Adam Cozzette
17b30e9647
Update protobuf version (#9119) 2021-10-20 10:14:02 -07:00
Adam Cozzette
3f3e6f47c6
Update version to 3.19.0-rc2 and fix changelog about Java 7 (#9116)
* Update protobuf version

* Update CHANGES.txt to reflect that we're not yet dropping Java 7
2021-10-19 09:01:57 -07:00
Adam Cozzette
519340d662
Update protobuf version (#9106) 2021-10-15 14:33:06 -07:00
deannagarcia
8b69867fef
Merge pull request #7642 from philjdf/master
[C#] Make FieldDescriptor propertyName public
2021-10-14 12:43:55 -07:00
Jan Tattermusch
3c8c0ae725
Merge pull request #7246 from ObsidianMinor/csharp/issue7241
Correctly set ExtensionRegistry when parsing with MessageParser, but using an already existing CodedInputStream
2021-10-13 14:45:33 +02:00
Adam Cozzette
3afc828309 Sync from Piper @401883098
PROTOBUF_SYNC_PIPER
2021-10-08 16:45:26 -07:00
Adam Cozzette
2a75e8ca58 Merge branch '3.18.x' into merge-3.18.x 2021-10-05 14:04:13 -07:00
Adam Cozzette
0dab03ba7b
Update protobuf version to 3.18.1 (#9051)
* Update protobuf version

* Update PHP release notes in package.xml
2021-10-04 17:43:33 -07:00
Joshua Haberman
2128ce074f Merge branch '3.18.x' into merge-release 2021-09-27 15:29:06 -07:00
Paul Yang
12fb2b7450
Update protobuf version (#8973)
* Update protobuf version

* Update php notes
2021-09-13 12:34:03 -07:00
Joshua Haberman
e5c570bb57 Sync from Piper @395706834
PROTOBUF_SYNC_PIPER
2021-09-09 08:21:42 -07:00
Bo Yang
d8f55782b0 Update protobuf version 2021-08-27 14:39:58 -07:00
Paul Yang
7cbc08615f
Update protobuf version (#8887) 2021-08-18 17:20:20 -07:00
Adam Cozzette
562fc946c7 Sync from Piper @388508285
PROTOBUF_SYNC_PIPER
2021-08-03 11:58:05 -07:00
Joshua Haberman
9521803d40 Sync from Piper @375548932
PROTOBUF_SYNC_PIPER
2021-05-24 13:49:39 -07:00
Deanna Garcia
380e352b0b Sync from Piper @373820256
PROTOBUF_SYNC_PIPER
2021-05-14 17:50:31 +00:00
Joshua Haberman
f5fd897c1d Sync from Piper @371422642
PROTOBUF_SYNC_PIPER
2021-04-30 16:12:50 -07:00
Joshua Haberman
ce560630bf Sync from Piper @368734211
PROTOBUF_SYNC_PIPER
2021-04-15 15:53:17 -07:00
Derek Perez
4008d229aa Sync from Piper @366297034
PROTOBUF_SYNC_PIPER
2021-04-01 18:49:52 +00:00
Joshua Haberman
96307d28f6 Sync from Piper @364389596
PROTOBUF_SYNC_PIPER
2021-03-22 13:05:55 -07:00
Joshua Haberman
9df42757f9 Sync from Piper @359788468
PROTOBUF_SYNC_PIPER
2021-02-26 10:37:37 -08:00
Adam Cozzette
d8254a67ce Merge branch '3.15.x' into 3.15.x-202102231541 2021-02-23 15:51:34 -08:00
Adam Cozzette
d7e943b8d2 Update protobuf version 2021-02-23 13:21:42 -08:00
Adam Cozzette
6e84adc9ff Merge branch '3.15.x' into merge-3-15-x 2021-02-22 11:03:32 -08:00
Adam Cozzette
052dc799d2 Update protobuf version 2021-02-19 15:12:24 -08:00
Adam Cozzette
133e5e7526 Update protobuf version 2021-02-18 16:53:24 -08:00
Adam Cozzette
de701c660b Update protobuf version 2021-02-18 16:53:24 -08:00
Adam Cozzette
ac9218c5d9 Update protobuf version 2021-02-18 16:53:24 -08:00
Adam Cozzette
ae50d9b990 Update protobuf version 2021-02-18 11:50:15 -08:00
Adam Cozzette
8260126500 Update protobuf version 2021-02-17 10:51:33 -08:00