Merge branch 'master' of github.com:rules-proto-grpc/rules_proto_grpc

Author: aaliddell

.bazelci/presubmit.yml

@@ -9,31 +9,43 @@ tasks:
       - "--host_cxxopt=-std=c++17"
     test_targets:
       - "//examples/routeguide:cpp_cpp"
+      - "//examples/routeguide:cpp_csharp"
       - "//examples/routeguide:cpp_go"
       - "//examples/routeguide:cpp_java"
       - "//examples/routeguide:cpp_js"
       - "//examples/routeguide:cpp_python"
+      - "//examples/routeguide:csharp_cpp"
+      - "//examples/routeguide:csharp_csharp"
+      - "//examples/routeguide:csharp_go"
+      - "//examples/routeguide:csharp_java"
+      - "//examples/routeguide:csharp_js"
+      - "//examples/routeguide:csharp_python"
       - "//examples/routeguide:go_cpp"
+      - "//examples/routeguide:go_csharp"
       - "//examples/routeguide:go_go"
       - "//examples/routeguide:go_java"
       - "//examples/routeguide:go_js"
       - "//examples/routeguide:go_python"
       - "//examples/routeguide:java_cpp"
+      - "//examples/routeguide:java_csharp"
       - "//examples/routeguide:java_go"
       - "//examples/routeguide:java_java"
       - "//examples/routeguide:java_js"
       - "//examples/routeguide:java_python"
       - "//examples/routeguide:js_cpp"
+      - "//examples/routeguide:js_csharp"
       - "//examples/routeguide:js_go"
       - "//examples/routeguide:js_java"
       - "//examples/routeguide:js_js"
       - "//examples/routeguide:js_python"
       - "//examples/routeguide:python_cpp"
+      - "//examples/routeguide:python_csharp"
       - "//examples/routeguide:python_go"
       - "//examples/routeguide:python_java"
       - "//examples/routeguide:python_js"
       - "//examples/routeguide:python_python"
       - "//examples/routeguide:scala_cpp"
+      - "//examples/routeguide:scala_csharp"
       - "//examples/routeguide:scala_go"
       - "//examples/routeguide:scala_java"
       - "//examples/routeguide:scala_js"
@@ -48,31 +60,43 @@ tasks:
       - "--host_cxxopt=-std=c++17"
     test_targets:
       - "//examples/routeguide:cpp_cpp"
+      - "//examples/routeguide:cpp_csharp"
       - "//examples/routeguide:cpp_go"
       - "//examples/routeguide:cpp_java"
       - "//examples/routeguide:cpp_js"
       - "//examples/routeguide:cpp_python"
+      - "//examples/routeguide:csharp_cpp"
+      - "//examples/routeguide:csharp_csharp"
+      - "//examples/routeguide:csharp_go"
+      - "//examples/routeguide:csharp_java"
+      - "//examples/routeguide:csharp_js"
+      - "//examples/routeguide:csharp_python"
       - "//examples/routeguide:go_cpp"
+      - "//examples/routeguide:go_csharp"
       - "//examples/routeguide:go_go"
       - "//examples/routeguide:go_java"
       - "//examples/routeguide:go_js"
       - "//examples/routeguide:go_python"
       - "//examples/routeguide:java_cpp"
+      - "//examples/routeguide:java_csharp"
       - "//examples/routeguide:java_go"
       - "//examples/routeguide:java_java"
       - "//examples/routeguide:java_js"
       - "//examples/routeguide:java_python"
       - "//examples/routeguide:js_cpp"
+      - "//examples/routeguide:js_csharp"
       - "//examples/routeguide:js_go"
       - "//examples/routeguide:js_java"
       - "//examples/routeguide:js_js"
       - "//examples/routeguide:js_python"
       - "//examples/routeguide:python_cpp"
+      - "//examples/routeguide:python_csharp"
       - "//examples/routeguide:python_go"
       - "//examples/routeguide:python_java"
       - "//examples/routeguide:python_js"
       - "//examples/routeguide:python_python"
       - "//examples/routeguide:scala_cpp"
+      - "//examples/routeguide:scala_csharp"
       - "//examples/routeguide:scala_go"
       - "//examples/routeguide:scala_java"
       - "//examples/routeguide:scala_js"
@@ -87,15 +111,23 @@ tasks:
       - "--host_cxxopt=-std=c++17"
     test_targets:
       - "//examples/routeguide:cpp_cpp"
+      - "//examples/routeguide:cpp_csharp"
       - "//examples/routeguide:cpp_go"
       - "//examples/routeguide:cpp_python"
+      - "//examples/routeguide:csharp_cpp"
+      - "//examples/routeguide:csharp_csharp"
+      - "//examples/routeguide:csharp_go"
+      - "//examples/routeguide:csharp_python"
       - "//examples/routeguide:go_cpp"
+      - "//examples/routeguide:go_csharp"
       - "//examples/routeguide:go_go"
       - "//examples/routeguide:go_python"
       - "//examples/routeguide:python_cpp"
+      - "//examples/routeguide:python_csharp"
       - "//examples/routeguide:python_go"
       - "//examples/routeguide:python_python"
       - "//examples/routeguide:scala_cpp"
+      - "//examples/routeguide:scala_csharp"
       - "//examples/routeguide:scala_go"
       - "//examples/routeguide:scala_python"
 
@@ -165,6 +197,42 @@ tasks:
       - make cpp_cpp_proto_library_example
       - make cpp_cpp_grpc_library_example
 
+  csharp_ubuntu2204_examples:
+    name: C#
+    platform: ubuntu2204
+    environment:
+      BAZEL_EXTRA_FLAGS: "--cxxopt=-std=c++17 --host_cxxopt=-std=c++17"
+    shell_commands:
+      - set -x
+      - make csharp_csharp_proto_compile_example
+      - make csharp_csharp_grpc_compile_example
+      - make csharp_csharp_proto_library_example
+      - make csharp_csharp_grpc_library_example
+
+  csharp_macos_examples:
+    name: C#
+    platform: macos
+    environment:
+      BAZEL_EXTRA_FLAGS: "--cxxopt=-std=c++17 --host_cxxopt=-std=c++17"
+    shell_commands:
+      - set -x
+      - make csharp_csharp_proto_compile_example
+      - make csharp_csharp_grpc_compile_example
+      - make csharp_csharp_proto_library_example
+      - make csharp_csharp_grpc_library_example
+
+  csharp_macos_arm64_examples:
+    name: C#
+    platform: macos_arm64
+    environment:
+      BAZEL_EXTRA_FLAGS: "--cxxopt=-std=c++17 --host_cxxopt=-std=c++17"
+    shell_commands:
+      - set -x
+      - make csharp_csharp_proto_compile_example
+      - make csharp_csharp_grpc_compile_example
+      - make csharp_csharp_proto_library_example
+      - make csharp_csharp_grpc_library_example
+
   doc_ubuntu2204_examples:
     name: Documentation
     platform: ubuntu2204

.bazelignore

@@ -9,6 +9,11 @@ examples/cpp/cpp_grpc_compile
 examples/cpp/cpp_proto_library
 examples/cpp/cpp_grpc_library
 
+examples/csharp/csharp_proto_compile
+examples/csharp/csharp_grpc_compile
+examples/csharp/csharp_proto_library
+examples/csharp/csharp_grpc_library
+
 examples/doc/doc_docbook_compile
 examples/doc/doc_html_compile
 examples/doc/doc_json_compile

MODULE.bazel

@@ -2,6 +2,7 @@ bazel_dep(name = "buildifier_prebuilt", version = "8.2.0.2")
 bazel_dep(name = "gazelle", version = "0.44.0")
 bazel_dep(name = "protobuf", version = "31.1")
 bazel_dep(name = "rules_cc", version = "0.1.4")
+bazel_dep(name = "rules_dotnet", version = "0.19.2")
 bazel_dep(name = "rules_go", version = "0.55.1")
 bazel_dep(name = "rules_java", version = "8.14.0")
 bazel_dep(name = "rules_scala", version = "7.0.0")
@@ -54,6 +55,13 @@ protoc.toolchain(
     version = "v31.1",
 )
 
+# C#
+bazel_dep(name = "rules_proto_grpc_csharp", version = "0.0.0.rpg.version.placeholder")
+local_path_override(
+    module_name = "rules_proto_grpc_csharp",
+    path = "modules/csharp",
+)
+
 # Documentation
 bazel_dep(name = "rules_proto_grpc_doc", version = "0.0.0.rpg.version.placeholder")
 local_path_override(

Makefile

@@ -24,6 +24,15 @@ buildifier:
 	bazel run //tools:buildifier
 
 
+# Update C# paket lock and paket2bazel extension
+.PHONY: csharp_regenerate_packages
+csharp_regenerate_packages:
+	cd modules/csharp/paket && dotnet new tool-manifest || true
+	cd modules/csharp/paket && dotnet tool install paket
+	cd modules/csharp/paket && dotnet paket install
+	bazel run @rules_dotnet//tools/paket2bazel -- --dependencies-file $$(pwd)/modules/csharp/paket/paket.dependencies --output-folder $$(pwd)/modules/csharp/paket
+	rm -r modules/csharp/paket/.config modules/csharp/paket/paket-files
+
 # Run pnpm to upgrade JS dependencies
 .PHONY: js_resolve
 js_resolve:

README.md

@@ -117,6 +117,10 @@ Full documentation for the current and previous versions [can be found here](htt
 | [C++](https://rules-proto-grpc.com/en/latest/lang/cpp.html) | [cpp_grpc_compile](https://rules-proto-grpc.com/en/latest/lang/cpp.html#cpp-grpc-compile) | Generates C++ protobuf and gRPC ``.h`` & ``.cc`` files ([example](/examples/cpp/cpp_grpc_compile)) |
 | [C++](https://rules-proto-grpc.com/en/latest/lang/cpp.html) | [cpp_proto_library](https://rules-proto-grpc.com/en/latest/lang/cpp.html#cpp-proto-library) | Generates a C++ protobuf library using ``cc_library``, with dependencies linked ([example](/examples/cpp/cpp_proto_library)) |
 | [C++](https://rules-proto-grpc.com/en/latest/lang/cpp.html) | [cpp_grpc_library](https://rules-proto-grpc.com/en/latest/lang/cpp.html#cpp-grpc-library) | Generates a C++ protobuf and gRPC library using ``cc_library``, with dependencies linked ([example](/examples/cpp/cpp_grpc_library)) |
+| [C#](https://rules-proto-grpc.com/en/latest/lang/csharp.html) | [csharp_proto_compile](https://rules-proto-grpc.com/en/latest/lang/csharp.html#csharp-proto-compile) | Generates C# protobuf ``.cs`` files ([example](/examples/csharp/csharp_proto_compile)) |
+| [C#](https://rules-proto-grpc.com/en/latest/lang/csharp.html) | [csharp_grpc_compile](https://rules-proto-grpc.com/en/latest/lang/csharp.html#csharp-grpc-compile) | Generates C# protobuf and gRPC ``.cs`` files ([example](/examples/csharp/csharp_grpc_compile)) |
+| [C#](https://rules-proto-grpc.com/en/latest/lang/csharp.html) | [csharp_proto_library](https://rules-proto-grpc.com/en/latest/lang/csharp.html#csharp-proto-library) | Generates a C# protobuf library using ``csharp_library`` from ``rules_dotnet`` ([example](/examples/csharp/csharp_proto_library)) |
+| [C#](https://rules-proto-grpc.com/en/latest/lang/csharp.html) | [csharp_grpc_library](https://rules-proto-grpc.com/en/latest/lang/csharp.html#csharp-grpc-library) | Generates a C# protobuf and gRPC library using ``csharp_library`` from ``rules_dotnet`` ([example](/examples/csharp/csharp_grpc_library)) |
 | [Documentation](https://rules-proto-grpc.com/en/latest/lang/doc.html) | [doc_docbook_compile](https://rules-proto-grpc.com/en/latest/lang/doc.html#doc-docbook-compile) | Generates DocBook ``.xml`` documentation file ([example](/examples/doc/doc_docbook_compile)) |
 | [Documentation](https://rules-proto-grpc.com/en/latest/lang/doc.html) | [doc_html_compile](https://rules-proto-grpc.com/en/latest/lang/doc.html#doc-html-compile) | Generates ``.html`` documentation file ([example](/examples/doc/doc_html_compile)) |
 | [Documentation](https://rules-proto-grpc.com/en/latest/lang/doc.html) | [doc_json_compile](https://rules-proto-grpc.com/en/latest/lang/doc.html#doc-json-compile) | Generates ``.json`` documentation file ([example](/examples/doc/doc_json_compile)) |

docs/index.rst

@@ -98,6 +98,9 @@ Supported Languages and Tools
    * - C++
      - ✔
      - ✔
+   * - C#
+     - ✔
+     - ✔
    * - Go
      - ✔
      - ✔
@@ -162,6 +165,7 @@ Supported Languages and Tools
 
    lang/buf
    lang/cpp
+   lang/csharp
    lang/doc
    lang/go
    lang/grpc_gateway