Commit Graph

732 Commits

Author SHA1 Message Date
Sydney Acksman
ca123ec40e Swap registry from input when merging from existing input 2020-02-22 22:55:48 -06:00
Rafi Kamal
0eb476b696 Merge branch 3.11.x to master 2020-02-18 16:42:47 -08:00
Rafi Kamal
147fd0b710
Update Google.Protobuf.Tools.nuspec to remove 32-bit Mac protoc reference (#7227) 2020-02-18 10:23:20 -08:00
Rafi Kamal
1f2d6bf4b5
Remove 32-bit Mac binary from csharp build tools (#7215) 2020-02-14 12:50:45 -08:00
Jan Tattermusch
0e8f69e532
enforce recursion depth checking for unknown fields (#7210) 2020-02-14 10:17:06 -08:00
Rafi Kamal
c74057267d
Update protobuf version (#7206) 2020-02-12 14:41:16 -08:00
Jan Tattermusch
f20be83927 enforce recursion depth checking for unknown fields 2020-02-10 15:30:47 -08:00
Rafi Kamal
fedb2beee3
Merge pull request #6938 from ObsidianMinor/csharp/fix/6936 (#7188)
Fix latest ArgumentException for C# extensions

Co-authored-by: Jan Tattermusch <jtattermusch@users.noreply.github.com>
2020-02-10 10:46:19 -08:00
Rafi Kamal
345df38dd3
Update protobuf version (#7143) 2020-01-31 13:47:09 -08:00
Paul Yang
e8016753e3
Maven requires https connection (#7110) (#7114) 2020-01-22 12:29:56 -08:00
Paul Yang
39f4240856
Maven requires https connection (#7110) 2020-01-20 19:23:06 -08:00
Rafi Kamal
ed8688de72
Merge pull request #7064 from rafi-kamal/3.11.x-202001071136
Merge branch 3.11.x to master
2020-01-08 12:24:20 -08:00
Brian Wignall
a104dffcb6 Fix typos (#7050)
Uses https://en.wikipedia.org/wiki/Wikipedia:Lists_of_common_misspellings/For_machines to find likely typos, with https://github.com/bwignall/typochecker to help automate the checking.
2020-01-08 10:18:20 -08:00
Rafi Kamal
4500f31a6a Merge branch 3.11.x to master 2020-01-07 11:52:29 -08:00
Rafi Kamal
39492b68d8
Update protobuf version to 3.11.2 (#7004) 2019-12-10 17:50:28 -08:00
Jan Tattermusch
20b7fab0a9
Merge pull request #6674 from ObsidianMinor/csharp/general-cleanup
Cleanup various bits of Google.Protobuf
2019-12-05 10:38:10 +01:00
Jan Tattermusch
c8a56342d5
Merge pull request #6938 from ObsidianMinor/csharp/fix/6936
Fix latest ArgumentException for C# extensions
2019-12-05 10:36:47 +01:00
Sydney Acksman
367fd27732 Rename files and revert changes to generate protos script 2019-12-03 10:52:24 -06:00
Sydney Acksman
d5e964c8bb Make test comment a summary 2019-12-03 10:46:34 -06:00
Rafi Kamal
b78c53f935
Update protobuf version to 3.11.1 (#6972) 2019-12-02 11:57:21 -08:00
Sydney Acksman
34f9497162 Use explicit comparer for extension identifiers 2019-12-02 13:56:21 -06:00
Sydney Acksman
1a0ff9551a Add comment and Assert.DoesNotThrow to RequiredFieldsNoThrow 2019-12-02 13:50:51 -06:00
Sydney Acksman
145033c056 Adjust based on review feedback 2019-11-27 11:32:13 -06:00
Jan Tattermusch
058d5b0d71
Merge pull request #6910 from ObsidianMinor/csharp/conformance-failures
Fix conformance test failures for Google.Protobuf
2019-11-26 17:18:05 +01:00
Rafi Kamal
1d5375c621
Update protobuf version to 3.11.0 (#6943) 2019-11-25 15:12:00 -08:00
Jan Tattermusch
96e9ff3863 Revert "Revert "C# upgrade dotnet SDK (#6877)" (#6888)" (#6920)
This reverts commit f06800524f.
2019-11-25 11:29:47 -08:00
Sydney Acksman
cd11d5414f Improve test to make sure the extensions are actually loaded for CustomOptions 2019-11-24 14:56:35 -06:00
Sydney Acksman
2b0b838528 Add tests 2019-11-24 14:22:50 -06:00
Sydney Acksman
3c2a32a75f Use Distinct on depended extensions to filter duplicate extensions 2019-11-24 14:22:26 -06:00
Rafi Kamal
6220db4ec4
Update protobuf version (#6927) 2019-11-21 19:10:04 -08:00
Sydney Acksman
f084d622c2 Add test for not throwing on missing required 2019-11-20 11:54:20 -06:00
Sydney Acksman
6f09cc3a0c Fix readability. 2019-11-20 10:56:34 -06:00
Sydney Acksman
3457f88940 Fix formatting 2019-11-20 10:55:48 -06:00
Jan Tattermusch
77d33734cf
simpler fix 2019-11-20 12:48:49 +01:00
Sydney Acksman
71ac3e5c0e Fix exception message on unsupported request output format 2019-11-19 17:50:53 -06:00
Sydney Acksman
e2e70a8a42 Fix conformance test failures for Google.Protobuf 2019-11-19 17:50:46 -06:00
Rafi Kamal
cd7b27be38 Update protobuf version (#6898) 2019-11-19 15:32:13 -08:00
Sydney Acksman
71c492da3c Add some missing null-checks
Remove IsInitialized checks accidentally left in MessageParser
Simplify ExtensionCollection.CrossLink
2019-11-19 12:34:19 -06:00
Rafi Kamal
3cc55d6167
Update protobuf version (#6898) 2019-11-15 17:44:10 -08:00
Jie Luo
f06800524f
Revert "C# upgrade dotnet SDK (#6877)" (#6888)
This reverts commit 0c8acb6c8d.
2019-11-14 09:49:59 -08:00
Jan Tattermusch
0c8acb6c8d C# upgrade dotnet SDK (#6877)
* upgrade dotnet SDK

* upgrade dotnet SDK version in global.json
2019-11-14 09:39:31 -08:00
Rafi Kamal
394f5c8c0f Whitelist newly added conformance test failures for Ruby, C#, and PHP 2019-11-12 13:38:58 -08:00
Rafi Kamal
58d4420e2d Down Integrate Internal Changes 2019-11-12 13:38:58 -08:00
Sydney Acksman
b84929f7fb Rename .CodeGen to .TestProtos in Makefile and script 2019-11-08 08:41:26 -06:00
Sydney Acksman
51fa766baa Fix typos
Bring .NET Framework target down to 4.5
Rename project in comment
2019-11-08 07:23:51 -06:00
Sydney Acksman
a70c796988 Add project to solution 2019-11-08 07:23:51 -06:00
Sydney Acksman
8da87c6202 Rename Google.Protobuf.Test.CodeGen to Google.Protobuf.Test.TestProtos 2019-11-08 07:23:51 -06:00
Sydney Acksman
2bb49712aa Add comment to summarize project
Set lang version to C# 3.0
Add .NET Standard 2.0 target
Fix partial diagnostic string since it requires C# 6
2019-11-08 07:23:50 -06:00
Sydney Acksman
63780dfb28 Rebase on master 2019-11-08 07:23:50 -06:00
Sydney Acksman
a85c4a3299 Move generated test code to a seperate lib 2019-11-08 07:23:50 -06:00