Commit Graph

1031 Commits

Author SHA1 Message Date
Jon Skeet
cacb096002 Add CodeRush directory to .gitignore for C#
This is just a temporary directory for CodeRush, and should never
contain anything worth checking in. (Like the .vs directory.)
2022-06-14 10:03:38 +01:00
Jon Skeet
837db77ecf Remove C# code specific to .NET 3.5
The codebase has changed a lot since it was last able to compile
with .NET 3.5, so we don't need this vestigial code.
2022-06-14 10:03:38 +01:00
Sandy Zhang
258514019f Merge 21.x into main 2022-05-28 00:06:34 +00:00
Protobuf Team Bot
38e3a11a29 Updating version.json and repo version numbers to: 21.1 2022-05-27 14:07:46 -04:00
Protobuf Team Bot
59c6ff83e9 Updating version.json and repo version numbers to: 21.0 2022-05-25 13:51:01 -07:00
Deanna Garcia
da481978af Merge 21.x back to main 2022-05-20 17:39:11 +00:00
David L. Jones
7f2368933a Re-generate csharp and php golden proto files after changes to descriptor.proto. 2022-05-19 16:02:36 -07:00
Protobuf Team Bot
1fa42c4be4 Updating version.json and repo version numbers to: 21.0-rc2 2022-05-19 13:35:48 -07:00
Jan Tattermusch
70afbd3c8d regenerate C# protos 2022-05-19 16:42:21 +01:00
Jan Tattermusch
d2292fc5f6 regenerate C# protos 2022-05-18 18:18:25 +01:00
David L. Jones
cbd1adc6cf
[Bazel/C++] Factor out compiler packages. (#9985)
This change adds packages for protoc sources under src/google/protobuf/compiler (this is similar to what was done in #9980).
2022-05-17 16:39:47 -07:00
deannagarcia
088281d84b
Merge pull request #9964 from protocolbuffers/main-202205131806
Merge 21.x back to main
2022-05-16 09:06:11 -07:00
Vassil Kovatchev
9d7a449e5c Fix failing FieldMask.Merge for well-known wrapper field types 2022-05-16 15:12:19 +01:00
Deanna Garcia
4049efc7b0 Move to LF 2022-05-13 21:09:51 +00:00
Deanna Garcia
193da6c8a9 Merge release branch 21.x into main 2022-05-13 18:07:04 +00:00
Jon Skeet
c32d7ec2ab Helper method on Any to allow an any to be unpacked more easily
We already have the TypeRegistry abstraction for JSON parsing, so it lends itself well to this.

Note that this is much more useful than it would have been before C# gained pattern matching support: it's easy to imagine a switch statement/expression using pattern matching with the result of this, with cases for a set of known message types, for example.
2022-05-13 16:09:12 +01:00
Protobuf Team
d259bd3287 Updating version.json and repo version numbers to: 21.0-rc1 2022-05-10 11:34:07 -07:00
David L. Jones
95da0ba5b4
Rename all BUILD files to BUILD.bazel (#9892)
This avoids conflicting names in a couple of cases.

1. Within google, we want to sync files but not name them BUILD (since the structure doesn't match).
2. On case-insensitive filesystems, `build` may be used for a build directory. Naming `BUILD.bazel` avoids potentioal conflicts.
2022-04-29 17:57:55 -07:00
Joshua Haberman
dc4aad931e Sync from Piper @444600173
PROTOBUF_SYNC_PIPER
2022-04-26 17:38:22 +00:00
David L. Jones
9e09343a49 Sync from Piper @441896533
PROTOBUF_SYNC_PIPER
2022-04-14 17:36:14 -07:00
mkruskal-google
85aa87cbc9
Merge 3.20.1-rc1 into main (#9760)
* Fix NPE during encoding and add regression test for issue 9507.

(cherry picked from commit 58e320a732)

* Implement `respond_to?` in RubyMessage (#9677)

All synthetic methods implemented by `method_missing` are now supported by `respond_to?`.

Fixes issue #9202.

* Fix null pointer exceptions exposed by new regression tests.
* Fix clear_ on oneofs so that it is safe to call repeatedly and so that respond_to? does not depend on whether the oneof is currently cleared.
* Code cleanup: reenable more tests on JRuby.
* Align JRuby behavior with CRuby by throwing a RuntimeError when attempting to assign to a oneof.

(cherry picked from commit 8e7f936696)

* Update protobuf version

* Merge pull request #9727 from mlocati/build-packaged-php-extension

Fix building packaged PHP extension

(cherry picked from commit 7f9901c5f6)

* Update protobuf version

* Update changelogs for 3.20.1-rc1

Co-authored-by: Jason Lunn <jason.lunn@gmail.com>
Co-authored-by: Jorg Brown <jorg.brown@gmail.com>
2022-04-07 18:33:58 -04:00
Mike Kruskal
701650b7d0 Merge tag 'refs/tags/sync-piper' into sync-stage
# Conflicts:
#	csharp/src/Google.Protobuf.Test/testprotos.pb
2022-04-04 13:50:21 -07:00
Mike Kruskal
a29e0e3f44 Sync from Piper @439400376
PROTOBUF_SYNC_PIPER
2022-04-04 13:42:37 -07:00
Mike Kruskal
ffe4b0cfe6 Merge branch '3.20.x' into 3.20.x-202204011233 2022-04-01 12:34:01 -07:00
Jon Skeet
9e6e4eb425 Generated code for test protos for issue #9605 2022-03-30 16:33:00 +01:00
Jon Skeet
e2f845b2f1 Test proto and unit test for issue #9605
This doesn't test *all* possibilities (e.g. the field being a
wrapper, or a message field, etc) - but I'm fairly confident that I
found all the places referring to the case.
2022-03-30 16:33:00 +01:00
Jon Skeet
d7ef9cd2ba Make it easier to follow cmake/README.md instructions
When following the instructions directly (for developing on Windows) we should end up with a generator that's easy to run for csharp/generate_protos.sh, and we shouldn't end up trying to stage the build output.
2022-03-30 16:33:00 +01:00
Jon Skeet
afb0ca40b3 Change C# editor config to use LF by default 2022-03-29 16:38:30 +01:00
Jon Skeet
e1e9d3e6da Normalize all C# and .proto files to LF
This commit should have no non-whitespace changes

Fixes #9526 (in terms of content)
2022-03-29 16:38:30 +01:00
mkruskal-google
a114b008a2 Reverting change to target frameworks that breaks kokoro 2022-03-28 16:25:46 -07:00
Jensaarai
fb6016eaed Add .editorconfig for csharp directory
Nicer experience for e.g. VS Code
2022-03-26 06:54:27 +00:00
Darly Paredes
25045e3f69 Update protobuf version 2022-03-25 19:20:51 +00:00
Jensaarai
10df21ed5e Add .NET 6 target to Google.Protobuf test projects
* .NET 5 reaches end-of-support in May, so update the Benchmarks project
to `net6.0`
* Update some NuGet packages to latest.
2022-03-25 14:14:15 +00:00
Darly Paredes
a4c9effec1 Sync from Piper @436517178
PROTOBUF_SYNC_PIPER
2022-03-22 18:02:10 +00:00
James Newton-King
e5ae3bb763
[C#] Update GetExtension to support getting typed value (#9655) 2022-03-22 08:56:39 +00:00
Adam Cozzette
a336ba0346 Sync from Piper @435734090
PROTOBUF_SYNC_PIPER
2022-03-18 21:25:56 +00:00
theodorerose
ebfa0d345e Update protobuf version 2022-03-15 21:12:45 +00:00
Adam Cozzette
b20209f321 Sync from Piper @acozzette/proto_github_202203101748
PROTOBUF_SYNC_PIPER
2022-03-10 18:36:42 +00:00
Adam Cozzette
357e71679e
Merge pull request #9588 from protocolbuffers/master
Merge master into 3.20.x
2022-03-08 12:24:24 -08:00
Junrou Nishida
92cdf87f1a
[C#] fix parse failure for extensions with large field numbers (#9591) 2022-03-07 10:46:21 +00:00
Adam Cozzette
88a18db91e Update protobuf version 2022-03-04 09:52:19 -08:00
David L. Jones
1ba1d73e0d Sync from Piper @429333699
PROTOBUF_SYNC_PIPER
2022-02-17 09:53:51 -08:00
Joshua Haberman
dce403a8b3 Sync from Piper @427369078
PROTOBUF_SYNC_PIPER
2022-02-08 20:53:31 -08:00
Joshua Haberman
42e806fbf2 Merge branch 'master' into sync-stage-2 2022-02-08 18:36:24 -08:00
Elliotte Rusty Harold
867436c0b8
add test for clone of non-empty message (#9193)
* add test for clone

* use var

* reorder
2022-02-04 16:54:43 +00:00
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