set xds user agent name everywhere where grpc_csharp_ext is built (#26337)

* set xds user agent name everywhere where grpc_csharp_ext is built

* regenerate projects

CMakeLists.txt

@@ -272,6 +272,12 @@ else()
   set(_gRPC_CORE_NOSTDCXX_FLAGS "")
 endif()
 
+if (gRPC_XDS_USER_AGENT_IS_CSHARP)
+  # The value of the defines needs to contain quotes.
+  # See https://github.com/grpc/grpc/blob/fbf32836a418cc84f58786700273b65cb9174e1d/src/core/ext/xds/xds_api.cc#L854
+  add_definitions("-DGRPC_XDS_USER_AGENT_NAME_SUFFIX=\"csharp\"" "-DGRPC_XDS_USER_AGENT_VERSION_SUFFIX=\"2.39.0-dev\"")
+endif()
+
 include(cmake/abseil-cpp.cmake)
 include(cmake/address_sorting.cmake)
 include(cmake/benchmark.cmake)

src/csharp/experimental/build_native_ext_for_android.sh

@@ -47,6 +47,7 @@ ${ANDROID_SDK_CMAKE} ../.. \
   -DCMAKE_BUILD_TYPE=Release \
   -DANDROID_PLATFORM=android-19 \
   -DANDROID_ABI="${ANDROID_ABI}" \
-  -DANDROID_NDK="${ANDROID_NDK_PATH}"
+  -DANDROID_NDK="${ANDROID_NDK_PATH}" \
+  -DgRPC_XDS_USER_AGENT_IS_CSHARP=ON
 
 make -j4 grpc_csharp_ext

src/csharp/experimental/build_native_ext_for_ios.sh

@@ -31,6 +31,11 @@ function build {
     CPPFLAGS="-O2 -Wframe-larger-than=16384 -arch $ARCH -isysroot $(xcrun --sdk $SDK --show-sdk-path) -mios-version-min=9.0 -DPB_NO_PACKED_STRUCTS=1"
     LDFLAGS="-arch $ARCH -isysroot $(xcrun --sdk $SDK --show-sdk-path) -Wl,ios_version_min=9.0"
 
+    # TODO(jtattermusch): Ideally we'd be setting build defines that correspond to using cmake's
+    # gRPC_XDS_USER_AGENT_IS_CSHARP option here, but since using XDS with C# on iOS is unlikely
+    # and gRPC C#'s support of iOS is only experimental, it's fair to skip that for now
+    # (which will result in XDS user agent language being "not specified" and that's ok
+    # since there are other circumstances in which it isn't set).
     # TODO(jtattermusch): revisit the build arguments
     make -j4 static_csharp \
         VALID_CONFIG_ios_$ARCH="1" \

templates/CMakeLists.txt.template

@@ -318,6 +318,12 @@
     set(_gRPC_CORE_NOSTDCXX_FLAGS "")
   endif()
 
+  if (gRPC_XDS_USER_AGENT_IS_CSHARP)
+    # The value of the defines needs to contain quotes.
+    # See https://github.com/grpc/grpc/blob/fbf32836a418cc84f58786700273b65cb9174e1d/src/core/ext/xds/xds_api.cc#L854
+    add_definitions("-DGRPC_XDS_USER_AGENT_NAME_SUFFIX=\"csharp\"" "-DGRPC_XDS_USER_AGENT_VERSION_SUFFIX=\"${settings.csharp_version}\"")
+  endif()
+
   include(cmake/abseil-cpp.cmake)
   include(cmake/address_sorting.cmake)
   include(cmake/benchmark.cmake)

tools/run_tests/artifacts/build_artifact_csharp.bat

@@ -35,7 +35,7 @@ if "%ARCHITECTURE%" == "x64" (
 )
 
 call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" %ARCHITECTURE%
-cmake -G Ninja -DCMAKE_C_COMPILER="%MSVC_COMPILER%" -DCMAKE_CXX_COMPILER="%MSVC_COMPILER%" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DgRPC_BUILD_TESTS=OFF -DgRPC_MSVC_STATIC_RUNTIME=ON ../../.. || goto :error
+cmake -G Ninja -DCMAKE_C_COMPILER="%MSVC_COMPILER%" -DCMAKE_CXX_COMPILER="%MSVC_COMPILER%" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DgRPC_BUILD_TESTS=OFF -DgRPC_MSVC_STATIC_RUNTIME=ON -DgRPC_XDS_USER_AGENT_IS_CSHARP=ON ../../.. || goto :error
 cmake --build . --target grpc_csharp_ext
 cd ..\..\..
 

tools/run_tests/artifacts/build_artifact_csharp.sh

@@ -23,6 +23,7 @@ cd cmake/build
 cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
       -DgRPC_BACKWARDS_COMPATIBILITY_MODE=ON \
       -DgRPC_BUILD_TESTS=OFF \
+      -DgRPC_XDS_USER_AGENT_IS_CSHARP=ON \
       ../..
 
 make grpc_csharp_ext -j2

tools/run_tests/helper_scripts/pre_build_csharp.bat

@@ -28,7 +28,7 @@ cd build
 mkdir %ARCHITECTURE%
 cd %ARCHITECTURE%
 
-cmake -G "Visual Studio 14 2015" -A %ARCHITECTURE% -DgRPC_BUILD_TESTS=OFF -DgRPC_MSVC_STATIC_RUNTIME=ON ../../.. || goto :error
+cmake -G "Visual Studio 14 2015" -A %ARCHITECTURE% -DgRPC_BUILD_TESTS=OFF -DgRPC_MSVC_STATIC_RUNTIME=ON  -DgRPC_XDS_USER_AGENT_IS_CSHARP=ON ../../.. || goto :error
 
 cd ..\..\..\src\csharp
 

tools/run_tests/helper_scripts/pre_build_csharp.sh

@@ -21,7 +21,7 @@ cd "$(dirname "$0")/../../.."
 mkdir -p cmake/build
 cd cmake/build
 
-cmake -DgRPC_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE="${MSBUILD_CONFIG}" ../..
+cmake -DgRPC_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE="${MSBUILD_CONFIG}" -DgRPC_XDS_USER_AGENT_IS_CSHARP=ON ../..
 
 cd ../../src/csharp