Commit Graph

2129 Commits

Author SHA1 Message Date
tony 3679f5ee75
Document using other binaries in Grpc.Tools (#32553)
Added documentation on how to use `Grpc.Tools` MSBuild integration with
*unsupported* architectures - i.e. third party built `protoc` and
`grpc_csharp_plugin`.
2023-03-23 15:44:58 +01:00
Jan Tattermusch 5873ba96dc
Ensure compatibility with the new custom kokoro win2019 image (#32649)
Fix incompatibilities identified when running adhoc runs on the new
custom win2019 image.
After merging this, it should be possible to switch to the new image
without breaking any tests.

- for most fixes I added a comment that explains why they're necessary.
- the new image won't have VS2015 installed, so I'm switching the protoc
artifact build to VS2017

This PR will need to be backported to older release branches to ensure
the windows tests continue working on those branches as well (IMHO I
haven't made any changes that would be difficult to backport and I tried
to keeps the diff as small as possible to avoid issues when
backporting).

After we switch to the new image (and all the windows tests are green),
we can incrementally move the builds that are still using VS2017 to
VS2019.
2023-03-20 16:03:50 +01:00
tony 2abf140f98
Add more Grpc.Tools integration tests (#32311)
Further Grpc.Tools tests
- TestCharactersInName - proto files with dots and numbers in their
names
- TestExtraOptions - test setting AdditionalProtocArguments,
OutputOptions and GrpcOutputOptions
- TestGrpcServices - test setting GrpcServices to "none", "client",
"server" and "both"
- TestSetOutputDirs - test setting OutputDir and GrpcOutputDir
2023-03-02 14:44:52 +01:00
Mark D. Roth 50e6af14ff
Bump dev version to 1.54.0-dev (#32426) 2023-02-21 12:03:19 -08:00
tony 3e70a163e2
Rewrite Grpc.Tools BUILD-INTEGRATION.md docs (#32075)
* Rewrite Grpc.Tools BUILD-INTEGRATION.md docs

* Minor edits to text

* various adjustments and typos for Grpc.Tools readme

* Updated with review suggestions

* Further refinements to the docs

* Add README for Grpc.Tools package

* Update BUILD-INTEGRATION.md

* Updated from review comments

Co-authored-by: Jan Tattermusch <jtattermusch@google.com>
2023-01-23 16:49:42 +01:00
tony 13186065a8
Add test for duplicate proto file name (#32152) 2023-01-23 11:16:16 +01:00
Jan Tattermusch dafcb3b6e6
Update third_party/protobuf to 3.21.12 (#32136)
* Update third_party/protobuf

* run tools/distrib/python/make_grpcio_tools.py

* update build_handwritten.yaml

* regenerate projects

* manual change: fix tools/distrib/check_protobuf_pod_version.sh to accept new-style protobuf tags

* improve comments for check_protobuf_pod_version hack
2023-01-20 21:18:53 +01:00
Jan Tattermusch 7fd808f6f9
Bump version to 1.53.0-dev (on master branch) (#32086)
* bump version to 1.53.0-dev

* regenerate projects
2023-01-18 09:41:33 +01:00
dependabot[bot] baedc454e7
Bump Newtonsoft.Json in /src/csharp/Grpc.Tools.Tests (#32047)
Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) from 9.0.1 to 13.0.1.
- [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases)
- [Commits](https://github.com/JamesNK/Newtonsoft.Json/compare/9.0.1...13.0.1)

---
updated-dependencies:
- dependency-name: Newtonsoft.Json
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-01-16 15:47:02 +01:00
tony aea02409bb
Use x86 protoc binaries on arm64 Windows (#32017) 2023-01-16 11:10:46 +01:00
tony 0ff115e49c
Initial version of Grpc.Tools & Msbuild integration tests (#31638)
* Inital Grpc.Tools unit tests

* refining the tests

* Get tests to run on Linux

* further grpc.tools tests changes

* changes for relative/absoulte paths

* Simplify running on just one framework

* Add Protobuf.MSBuild.dll for tests to use

* fix typo in comment

* fix copyright note

* Revert "Add Protobuf.MSBuild.dll for tests to use"

This reverts commit 542756cade.

* cleanup Directory.Build.props

* fix location of tasksAssembly

* cleanup in preparing paths

* add test-out to .gitignore

* many simplifications to MsBuildIntegrationTest

* update expected test results data

* many improvements to fakeprotoc.py

* yapf code

* fix copyright licenses

* reintroduce normalized paths

* minor fixes

* attempt simplify Directory.Build.targets

* newline at EOF

* simplify result comparison

* add a TODO

* further simplify MsBuildIntegrationTest test harness

* avoid internal symbol conflict by diambiguating test protos

* add TODO

* style fixes

* one more fixup

Co-authored-by: Jan Tattermusch <jtattermusch@google.com>
2023-01-09 14:29:47 +01:00
tony 1cd92d9446
Add internal documentation for Grpc.Tools MSBuild integration (#31784)
* Developer doc for Grpc.Tools msbuild integration

* Fix formatting

* update docs from review comments

* small changes to the documentation
2022-12-22 09:50:40 +01:00
Richard Belleville 51f296b4f8
Bump master branch to 1.52.0-dev (gribkoff) (#31618)
* bump version to 1.52.0-dev

* regenerate projects
2022-11-10 16:11:08 -08:00
Esun Kim 42c2767c19
Revert "Bump v1.51.x to 1.51.0-pre1 (#31620)" (#31621)
This reverts commit bae9dd79aa.
2022-11-10 15:21:14 -08:00
Richard Belleville bae9dd79aa
Bump v1.51.x to 1.51.0-pre1 (#31620)
* bump version to 1.51.0-pre1

* regenerate projects
2022-11-10 15:17:59 -08:00
tony d3d2b64d23
Fix msbuild failing when '@' is present in path (2nd attempt) (#31527)
* Fix msbuild failing when '@' is present in path

There was ambiguity in references to Source metadata on some Items. These
are now qualified to remove the ambiguity.

* Revert "Fix msbuild failing when '@' is present in path"

This reverts commit bb5d5ddc61.

* Unescape Indentity when creating Source

* Fix spelling in comment
2022-11-08 12:07:39 +01:00
Jan Tattermusch ffe1f4af78
Revert "Fix msbuild failing when '@' is present in path (#31133)" (#31464)
This reverts commit 1a5ad72063.
2022-10-26 20:10:55 +02:00
tony 1a5ad72063
Fix msbuild failing when '@' is present in path (#31133)
There was ambiguity in references to Source metadata on some Items. These
are now qualified to remove the ambiguity.
2022-10-24 12:19:28 +02:00
Esun Kim f11282df8d
Bump dev version v1.51-dev (#31174)
* bump version to 1.51.0-dev

* regenerate projects
2022-09-29 14:58:01 -07:00
Richard Belleville e609ad88c9
Update protobuf to v21.6 (#31015)
* Update third_party/protobuf

* run tools/distrib/python/make_grpcio_tools.py

* update build_handwritten.yaml

* regenerate projects

* Update Python version floor
2022-09-16 17:50:52 -07:00
tony e313ac8398
Grpc.Tools: Parse warnings from libprotobuf (fix #27502) (#30371)
* issue 27502 - parse warning from libprotobuf

The warnings and errors logged by some of the pluggins such as the csharp
plugin are in a different format from other warnings etc logged by the
protobuf compiler (the plugins use GOOGLE_LOG to log message).
The parsing code in Grpc.Tools has been modified to correctly parse these
so that warnings are no longer handled as errors.

* Fix typos in comments
2022-09-05 10:58:25 +02:00
tony f0948a7c38
Grpc.Tools add support for env variable GRPC_PROTOC_PLUGIN (fix #27099) (#30411)
* issue 27099 Grpc.Tools add env GRPC_TOOL_PLUGIN
Added environment variable GRPC_TOOL_PLUGIN to override the
GRPC plugin path

* Change GRPC_TOOL_PLUGIN to GRPC_PROTOC_PLUGIN
2022-09-05 10:32:54 +02:00
tony dce1c83617
Grpc.Tools document AdditionalImportDirs (#30405)
* Grpc.Tools document AdditionalImportDirs

* Update doc for AdditionalImportDirs

* fix type

Co-authored-by: Jan Tattermusch <jtattermusch@google.com>
2022-09-02 17:25:48 +02:00
apolcyn 778f04dccf
Bump version on master branch to 1.50.0.dev (#30614)
* bump version to 1.50.0-dev

* regenerate projects
2022-08-17 18:20:27 -07:00
tony b85776b539
issue 25950 fix OutputOptions and GrpcOutputOptions (#30410) 2022-08-17 14:34:49 +02:00
apolcyn 27a9bde44b
Update protobuf submodule to 3.21.5 (#30548)
* Update third_party/protobuf

* run tools/distrib/python/make_grpcio_tools.py

* regenerate protos for ruby, php

* update build_handwritten.yaml

* regenerate projects
2022-08-10 09:39:26 -07:00
Yash Tibrewal 41ec08c69a
Update third_party/protobuf to 3.21.4 (#30377)
* Update third_party/protobuf

* run tools/distrib/python/make_grpcio_tools.py

* regenerate protos for ruby, php

* update build_handwritten.yaml

* regenerate projects

* Build - Use :well_known_type_protos instead of :well_known_protos

* Fix target

* Update upb

* Update Python for Protobuf 4.21 (#140)

* Update protobuf dependency on grpcio-tools

* Off by one

* Drop python 3.6 support

* Try upgrading pip

* And in the other script

* Try to figure out if we're compatible with abi3

* See what we've already got installed

* Update the requirements.txt file I didn't know existed

* And here too

* See what's installed

* Let's try that again

* Remove

* Try to confirm version

* Let me see the generated code

* Fix non-Bazel test runner

* Work for all test directories

* Regenerate example protos

* Clean up

* Generate .pyi files

* Fix type checking and linting

* Exclude pyi files from isort

* Upgrade to 3.21.4

* Update iwyu to get around messy protobuf IWYU rules

Co-authored-by: Richard Belleville <gnossen@gmail.com>
2022-08-04 09:39:49 -07:00
Yash Tibrewal 89f7534e43
Bump dev version 202207012203 (#30177)
* bump version to 1.49.0-dev

* regenerate projects
2022-07-04 16:38:08 -07:00
tony 6f698b56cf
Document specifying lists in MsBuild properties (#30117) 2022-07-04 10:30:31 +02:00
Richard Belleville 761bb3bfc3
Bump version to 1.48.0-dev (on master branch) (#29829)
* bump version to 1.48.0-dev

* regenerate projects
2022-05-27 15:16:27 -07:00
Jan Tattermusch e8404698d5
Remove C# implementation (individual packages will continue to be maintained through v2.46.x patches or moved to grpc-dotnet) (#29225)
* remove examples/csharp

* remove reference to examples/csharp

* remove C# references from doc/

* remove src/csharp

* update test_creds locations

* remove C# distribtests

* remove buildgen templates for files under src/csharp

* remove grpc_csharp_ext C build target

* regenerate projects

* update tools/run_tests/README.md

* change many C# test/build scripts to noop

* unbreak run_tests.py -l csharp

* unbreak C# build_package targets

* unbreak C# distribtests

* remove C# pre-build steps from prepare_build_windows.bat

* remove src/csharp from clang_format

* remove csharp and csharpcoreclr from run_interop_tests.py

* remove C# interop test docker images

* Revert "remove src/csharp"

This reverts commit 97f2b6d707.

* remove src/csharp, but keep Grpc.Tools

* add back templates/src/csharp/build/dependencies.props.template

* remove everything but Grpc.Tools and Grpc.Tools.Tests from sln

* Revert "unbreak run_tests.py -l csharp"

This reverts commit 529b5e2ec1.

* revive Grpc.Tools.Tests through run_tests.py

* Revert "unbreak C# build_package targets"

This reverts commit 79d8d83c8b.

* experiment with build_nuget.sh fixes

* simplify create_fake_native_artifacts.sh

* building of Grpc.Tools in package_targets.py

* move shared files from Grpc.Core to Grpc.Tools

* yapf format: distribtest_targets.py

* Revert "remove C# pre-build steps from prepare_build_windows.bat"

This reverts commit bd38956a2b.

* update C# README.md

* disable C# in gke OSS benchmarks
2022-04-28 12:00:34 +02:00
Lidi Zheng 98fc0260e3
Bump dev version to v1.47.0-dev (#29414)
* bump version to 1.47.0-dev

* regenerate projects
2022-04-15 13:25:15 -07:00
Jan Tattermusch 47aa3c23ac
add tests for #25682, at least for server streaming and bidi streaming calls (#29072) 2022-04-13 18:09:34 +02:00
Jan Tattermusch 519ae7d795
unbreak proto regenerate scripts for C#, ruby, php by allowing protobuf well known types (#29330)
* unbreak proto regenerate scripts for C#, ruby, php by allowing protobuf well known types

* regenerate C# and ruby protos
2022-04-07 09:14:05 +02:00
Jan Tattermusch 2223877d41
C# add RetryTest with service config to reproduce #23618 (#24413)
* C# add RetryTest with service config to reproduce #23618

* fixup tests
2022-04-04 18:47:33 +02:00
Jan Tattermusch e9ece8f746
add a repro and fix for #19090 (#23003) 2022-03-30 17:17:11 +02:00
Mahdi K. Fard 44f2c004c5
Fix double-space in xmldoc generation. (#29224)
* Fix double-space in xmldoc generation.

* regenerate C# protos

Co-authored-by: Jan Tattermusch <jtattermusch@google.com>
2022-03-29 15:33:57 +02:00
Jan Tattermusch 409c732813
C# windows single-job distribtest (#29152)
* add windows grpc_distribtest_csharp

* add kokoro cfg files
2022-03-18 16:34:31 +01:00
Jan Tattermusch 83ccb0deed
add C# macos distribtest in a single job (#28614) 2022-03-18 06:26:38 +01:00
Jan Tattermusch bcaa3cb48e
Remove C# Legacy (a.k.a. "Classic") csproj example (#29102)
* remove C# legacy csproj example

* update BUILD-INTEGRATION.md
2022-03-16 17:40:00 +01:00
AJ Heller 99a30de9e7
Bump version to 1.46.0-dev (on master branch) (#29064)
* bump version to 1.46.0-dev

* regenerate projects
2022-03-09 16:44:12 -08:00
James Newton-King 5ba6beff18
[C#] Add cancellation token overloads to streaming interfaces (#27886)
* Add cancellation token overloads to streaming interfaces

* PR feedback
2022-03-03 10:47:53 -08:00
Jan Tattermusch f574f70c68
fix C# single-job distribtests jobs when version has no suffix (#28924) 2022-03-03 10:46:01 -08:00
Jan Tattermusch 9d73b3e85a
Use ninja for all grpc_csharp_ext builds on windows (#28841)
* cleanup C# win artifact build

* build C# basictests on win with ninja

* specify default parallelism for C# win artifact

* honor GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS in build_artifact_python.bat

* set --inner_jobs for windows grpc_build_artifact job

* fixup C# build picking env variables from C core build

* get rid of no longer needed NativeDependenciesConfiguration C# setting
2022-02-11 18:58:04 +01:00
AJ Heller fc6f0277a4
Update third_party/protobuf to v3.19.4 (#28842)
* Update third_party/protobuf

* run tools/distrib/python/make_grpcio_tools.py

* update build_handwritten.yaml

* regenerate projects
2022-02-11 08:47:36 -08:00
yihuaz b458db9246
Eliminate gRPC insecure build (#25586)
* force submit

* fix test error

* remove is_client from local tsi and its callsites

* fix too_many_pings_test

* add missing dep
2022-02-10 11:17:18 -08:00
James Newton-King 257183f5ec
Grpc.Core.Api nullable fixes (#28616) 2022-01-20 12:30:29 +01:00
Jan Tattermusch 402981be8e
Bump version to 1.45.0-dev (#28553)
* bump version to 1.45.0-dev

* regenerate projects
2022-01-20 09:23:06 +01:00
Jan Tattermusch bf3ceddaac
allow running instances of DepFileUtilTest in parallel (#28612) 2022-01-19 18:24:01 +01:00
Jan Tattermusch 42c08b9b56
Update third_party/protobuf to v3.19.2 (#28511)
* Update third_party/protobuf

* run tools/distrib/python/make_grpcio_tools.py

* regenerate protos for csharp, ruby, php

* update build_handwritten.yaml

* regenerate projects
2022-01-12 18:35:07 +01:00