[CI] Updated RBE Windows Image (MSVC 2022) (#38063)

Updated the Windows RBE image to use MSVC 2022

This is the last part of upgrading MSVC to 2022. This aligns with the
minimum MSVC version required for gRPC, as stated in [the Foundational
C++ Support
Matrix](https://github.com/google/oss-policies-info/blob/main/foundational-cxx-support-matrix.md).

An alternative & incremental approach to
https://github.com/grpc/grpc/pull/37987
Follow-up of https://github.com/grpc/grpc/pull/38006

test/distrib/bazel/test_single_bazel_version.sh

@@ -63,7 +63,7 @@ EXCLUDED_TARGETS=(
 
   # Analyzing windows toolchains when running on linux results in an error.
   # Since bazel distribtests are run on linux, we exclude the windows RBE toolchains.
-  "-//third_party/toolchains/rbe_windows_bazel_7.3.1_vs2019/..."
+  "-//third_party/toolchains/rbe_windows_bazel_7.3.1_vs2022/..."
   "-//third_party/toolchains:rbe_windows_default_toolchain_suite"
 
   # Exclude bazelified tests as they contain some bazel hackery

third_party/toolchains/BUILD

@@ -52,13 +52,13 @@ platform(
 # The default toolchain suite for RBE windows, pass it to --crosstool_top
 alias(
     name = "rbe_windows_default_toolchain_suite",
-    actual = "//third_party/toolchains/rbe_windows_bazel_7.3.1_vs2019/cc:toolchain",
+    actual = "//third_party/toolchains/rbe_windows_bazel_7.3.1_vs2022/cc:toolchain",
 )
 
 # The default CC toolchain suite for RBE windows
 alias(
     name = "rbe_windows_default_cc_toolchain",
-    actual = "//third_party/toolchains/rbe_windows_bazel_7.3.1_vs2019/config:cc-toolchain",
+    actual = "//third_party/toolchains/rbe_windows_bazel_7.3.1_vs2022/config:cc-toolchain",
 )
 
 # The default platform for RBE windows
@@ -73,5 +73,5 @@ platform(
         os_family = "Windows",
     ),
     # Inherit from the platform target generated by 'rbe_configs_gen'.
-    parents = ["//third_party/toolchains/rbe_windows_bazel_7.3.1_vs2019/config:platform"],
+    parents = ["//third_party/toolchains/rbe_windows_bazel_7.3.1_vs2022/config:platform"],
 )

third_party/toolchains/README.md

@@ -6,7 +6,7 @@ Run `generate_linux_rbe_configs.sh` to regenerate.
 
 ## Windows
 
-The `rbe_windows_bazel_7.3.1_vs2019` directory contains the autogenerated toolchain configuration for windows RBE.
+The `rbe_windows_bazel_7.3.1_vs2022` directory contains the autogenerated toolchain configuration for windows RBE.
 The configuration was generated by the `rbe_configs_gen` tool (just as the linux RBE config),
 but since it's a windows configuration, it needs to be run on a windows machine.
 
@@ -34,4 +34,6 @@ On a kokoro debug windows VM, run the following:
 - To be able to authenticate when pushing the image to GAR, run `gcloud auth configure-docker us-docker.pkg.dev`
 - `docker push us-docker.pkg.dev/grpc-testing/testing-images-public/rbe_windows2019`
 - Update the `generate_windows_rbe_configs.sh` with the newly built & pushed image's SHA256 digest.
+  (If you're using the Kokoro Windows VM, you need to run `sed -i 's/\r$//' third_party/toolchains/generate_windows_rbe_configs.sh`
+   before running the script to remove `\r` characters that bash doesn't understand)
 - Regenerate the Windows RBE toolchain with the instructions above.

third_party/toolchains/dockerfile/rbe_windows2019/Dockerfile

@@ -1,13 +1,10 @@
 # This dockerfile is taken from go/rbe-windows-user-guide
-# Local modifications:
-# * install VS2019 (instead of VS2022)
-# TODO(jtattermusch): check the --compilation_mode=dbg fix
 
 # This Dockerfile creates an image that has the following:
 #  * correct MTU setting for networking from inside the container to work.
 #  * metadata server routes correctly installed 
 #  * VC++ redistributable installed
-#  * Visual Studio 2019 Build Tools installed
+#  * Visual Studio 2022 Build Tools installed
 #  * msys2 + git, curl, zip, unzip installed
 #  * Python 3.10.4 installed
 #  * JDK 17.0.2 installed
@@ -35,8 +32,8 @@ RUN New-Item -Path "C:/" -Name "TEMP" -ItemType "directory"; \
     Start-Process -filepath C:/TEMP/vc_redist.x64.exe -ArgumentList '/install', '/passive', '/norestart' -Wait; \
     Remove-Item C:/TEMP/vc_redist.x64.exe
 
-# Install Visual Studio 2019 Build Tools.
-RUN Invoke-WebRequest "https://aka.ms/vs/16/release/vs_buildtools.exe" \
+# Install Visual Studio 2022 Build Tools.
+RUN Invoke-WebRequest "https://aka.ms/vs/17/release/vs_buildtools.exe" \
         -OutFile C:/TEMP/vs_buildtools.exe -UseBasicParsing; \
     Start-Process -FilePath C:/TEMP/vs_buildtools.exe -ArgumentList "--installPath", "C:/VS", \
         "--quiet", "--wait", "--nocache", \

third_party/toolchains/generate_windows_rbe_configs.sh

@@ -28,7 +28,7 @@ wget https://github.com/bazelbuild/bazel-toolchains/releases/download/v5.1.2/rbe
 RBE_CONFIGS_GEN_TOOL_PATH="./rbe_configs_gen_windows_amd64.exe"
 
 # Actions on RBE will run under a dedicated docker image.
-WINDOWS_RBE_DOCKER_IMAGE=us-docker.pkg.dev/grpc-testing/testing-images-public/rbe_windows2019@sha256:1700f2ad0e7f5bdcafa56dce649720e6b12cf397e27990433871f11c75f68cb4
+WINDOWS_RBE_DOCKER_IMAGE=us-docker.pkg.dev/grpc-testing/testing-images-public/rbe_windows2019@sha256:5a97eb384a3089ac9180e6086ca89b1fdafa57735057624245b3d4a96b4744fe
 
 # Bazel version used for configuring
 # Needs to be one of the versions from bazel/supported_versions.txt chosen so that the result is compatible
@@ -36,7 +36,7 @@ WINDOWS_RBE_DOCKER_IMAGE=us-docker.pkg.dev/grpc-testing/testing-images-public/rb
 BAZEL_VERSION=7.3.1
 
 # Where to store the generated configs (relative to repo root)
-CONFIG_OUTPUT_PATH=third_party/toolchains/rbe_windows_bazel_7.3.1_vs2019
+CONFIG_OUTPUT_PATH=third_party/toolchains/rbe_windows_bazel_7.3.1_vs2022
 
 # Delete old generated configs.
 rm -rf "${REPO_ROOT}/${CONFIG_OUTPUT_PATH}"
@@ -48,7 +48,7 @@ docker pull ${WINDOWS_RBE_DOCKER_IMAGE}
 ${RBE_CONFIGS_GEN_TOOL_PATH} \
     --bazel_version="${BAZEL_VERSION}" \
     --toolchain_container="${WINDOWS_RBE_DOCKER_IMAGE}" \
-    --output_src_root="${REPO_ROOT}" \
+    --output_src_root=. \
     --output_config_path="${CONFIG_OUTPUT_PATH}" \
     --exec_os=windows \
     --target_os=windows \

third_party/toolchains/rbe_windows_bazel_7.3.1_vs2022/cc/BUILD

@@ -225,26 +225,27 @@ cc_toolchain_config(
     abi_libc_version = "local",
     toolchain_identifier = "msvc_x64",
     msvc_env_tmp = "C:\\Users\\ContainerAdministrator\\AppData\\Local\\Temp",
-    msvc_env_path = "C:\\VS\\VC\\Tools\\MSVC\\14.29.30133\\bin\\HostX64\\x64;C:\\VS\\Common7\\IDE\\VC\\VCPackages;C:\\VS\\Common7\\IDE\\CommonExtensions\\Microsoft\\TestWindow;C:\\VS\\Common7\\IDE\\CommonExtensions\\Microsoft\\TeamFoundation\\Team Explorer;C:\\VS\\MSBuild\\Current\\bin\\Roslyn;C:\\VS\\Common7\\Tools\\devinit;C:\\Program Files (x86)\\Windows Kits\\10\\bin\\10.0.20348.0\\x64;C:\\Program Files (x86)\\Windows Kits\\10\\bin\\x64;C:\\VS\\\\MSBuild\\Current\\Bin;C:\\Windows\\Microsoft.NET\\Framework64\\v4.0.30319;C:\\VS\\Common7\\IDE\\;C:\\VS\\Common7\\Tools\\;;C:\\Windows\\system32",
-    msvc_env_include = "C:\\VS\\VC\\Tools\\MSVC\\14.29.30133\\include;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\ucrt;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\shared;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\um;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\winrt;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\cppwinrt",
-    msvc_env_lib = "C:\\VS\\VC\\Tools\\MSVC\\14.29.30133\\lib\\x64;C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.20348.0\\ucrt\\x64;C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.20348.0\\um\\x64",
-    msvc_cl_path = "C:/VS/VC/Tools/MSVC/14.29.30133/bin/HostX64/x64/cl.exe",
-    msvc_ml_path = "C:/VS/VC/Tools/MSVC/14.29.30133/bin/HostX64/x64/ml64.exe",
-    msvc_link_path = "C:/VS/VC/Tools/MSVC/14.29.30133/bin/HostX64/x64/link.exe",
-    msvc_lib_path = "C:/VS/VC/Tools/MSVC/14.29.30133/bin/HostX64/x64/lib.exe",
-    cxx_builtin_include_directories = [        "C:\\VS\\VC\\Tools\\MSVC\\14.29.30133\\include",
+    msvc_env_path = "C:\\VS\\VC\\Tools\\MSVC\\14.41.34120\\bin\\HostX64\\x64;C:\\VS\\Common7\\IDE\\VC\\VCPackages;C:\\VS\\Common7\\IDE\\CommonExtensions\\Microsoft\\TestWindow;C:\\VS\\MSBuild\\Current\\bin\\Roslyn;C:\\VS\\Common7\\IDE\\Extensions\\Microsoft\\CodeCoverage.Console;C:\\Program Files (x86)\\Windows Kits\\10\\bin\\10.0.20348.0\\\\x64;C:\\Program Files (x86)\\Windows Kits\\10\\bin\\\\x64;C:\\VS\\\\MSBuild\\Current\\Bin\\amd64;C:\\Windows\\Microsoft.NET\\Framework64\\v4.0.30319;C:\\VS\\Common7\\IDE\\;C:\\VS\\Common7\\Tools\\;;C:\\Windows\\system32;C:\\VS\\Common7\\IDE\\VC\\Linux\\bin\\ConnectionManagerExe",
+    msvc_env_include = "C:\\VS\\VC\\Tools\\MSVC\\14.41.34120\\include;C:\\VS\\VC\\Auxiliary\\VS\\include;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\ucrt;C:\\Program Files (x86)\\Windows Kits\\10\\\\include\\10.0.20348.0\\\\um;C:\\Program Files (x86)\\Windows Kits\\10\\\\include\\10.0.20348.0\\\\shared;C:\\Program Files (x86)\\Windows Kits\\10\\\\include\\10.0.20348.0\\\\winrt;C:\\Program Files (x86)\\Windows Kits\\10\\\\include\\10.0.20348.0\\\\cppwinrt",
+    msvc_env_lib = "C:\\VS\\VC\\Tools\\MSVC\\14.41.34120\\lib\\x64;C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.20348.0\\ucrt\\x64;C:\\Program Files (x86)\\Windows Kits\\10\\\\lib\\10.0.20348.0\\\\um\\x64",
+    msvc_cl_path = "C:/VS/VC/Tools/MSVC/14.41.34120/bin/HostX64/x64/cl.exe",
+    msvc_ml_path = "C:/VS/VC/Tools/MSVC/14.41.34120/bin/HostX64/x64/ml64.exe",
+    msvc_link_path = "C:/VS/VC/Tools/MSVC/14.41.34120/bin/HostX64/x64/link.exe",
+    msvc_lib_path = "C:/VS/VC/Tools/MSVC/14.41.34120/bin/HostX64/x64/lib.exe",
+    cxx_builtin_include_directories = [        "C:\\VS\\VC\\Tools\\MSVC\\14.41.34120\\include",
+        "C:\\VS\\VC\\Auxiliary\\VS\\include",
         "C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\ucrt",
-        "C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\shared",
-        "C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\um",
-        "C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\winrt",
-        "C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\cppwinrt"],
+        "C:\\Program Files (x86)\\Windows Kits\\10\\\\include\\10.0.20348.0\\\\um",
+        "C:\\Program Files (x86)\\Windows Kits\\10\\\\include\\10.0.20348.0\\\\shared",
+        "C:\\Program Files (x86)\\Windows Kits\\10\\\\include\\10.0.20348.0\\\\winrt",
+        "C:\\Program Files (x86)\\Windows Kits\\10\\\\include\\10.0.20348.0\\\\cppwinrt"],
     tool_paths = {
-        "ar": "C:/VS/VC/Tools/MSVC/14.29.30133/bin/HostX64/x64/lib.exe",
-        "ml": "C:/VS/VC/Tools/MSVC/14.29.30133/bin/HostX64/x64/ml64.exe",
-        "cpp": "C:/VS/VC/Tools/MSVC/14.29.30133/bin/HostX64/x64/cl.exe",
-        "gcc": "C:/VS/VC/Tools/MSVC/14.29.30133/bin/HostX64/x64/cl.exe",
+        "ar": "C:/VS/VC/Tools/MSVC/14.41.34120/bin/HostX64/x64/lib.exe",
+        "ml": "C:/VS/VC/Tools/MSVC/14.41.34120/bin/HostX64/x64/ml64.exe",
+        "cpp": "C:/VS/VC/Tools/MSVC/14.41.34120/bin/HostX64/x64/cl.exe",
+        "gcc": "C:/VS/VC/Tools/MSVC/14.41.34120/bin/HostX64/x64/cl.exe",
         "gcov": "wrapper/bin/msvc_nop.bat",
-        "ld": "C:/VS/VC/Tools/MSVC/14.29.30133/bin/HostX64/x64/link.exe",
+        "ld": "C:/VS/VC/Tools/MSVC/14.41.34120/bin/HostX64/x64/link.exe",
         "nm": "wrapper/bin/msvc_nop.bat",
         "objcopy": "wrapper/bin/msvc_nop.bat",
         "objdump": "wrapper/bin/msvc_nop.bat",
@@ -297,26 +298,27 @@ cc_toolchain_config(
     abi_libc_version = "local",
     toolchain_identifier = "msvc_x64_x86",
     msvc_env_tmp = "C:\\Users\\ContainerAdministrator\\AppData\\Local\\Temp",
-    msvc_env_path = "C:\\VS\\VC\\Tools\\MSVC\\14.29.30133\\bin\\HostX64\\x86;C:\\VS\\VC\\Tools\\MSVC\\14.29.30133\\bin\\HostX64\\x64;C:\\VS\\Common7\\IDE\\VC\\VCPackages;C:\\VS\\Common7\\IDE\\CommonExtensions\\Microsoft\\TestWindow;C:\\VS\\Common7\\IDE\\CommonExtensions\\Microsoft\\TeamFoundation\\Team Explorer;C:\\VS\\MSBuild\\Current\\bin\\Roslyn;C:\\VS\\Common7\\Tools\\devinit;C:\\Program Files (x86)\\Windows Kits\\10\\bin\\10.0.20348.0\\x64;C:\\Program Files (x86)\\Windows Kits\\10\\bin\\x64;C:\\VS\\\\MSBuild\\Current\\Bin;C:\\Windows\\Microsoft.NET\\Framework64\\v4.0.30319;C:\\VS\\Common7\\IDE\\;C:\\VS\\Common7\\Tools\\;;C:\\Windows\\system32",
-    msvc_env_include = "C:\\VS\\VC\\Tools\\MSVC\\14.29.30133\\include;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\ucrt;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\shared;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\um;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\winrt;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\cppwinrt",
-    msvc_env_lib = "C:\\VS\\VC\\Tools\\MSVC\\14.29.30133\\lib\\x86;C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.20348.0\\ucrt\\x86;C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.20348.0\\um\\x86",
-    msvc_cl_path = "C:/VS/VC/Tools/MSVC/14.29.30133/bin/HostX64/x86/cl.exe",
-    msvc_ml_path = "C:/VS/VC/Tools/MSVC/14.29.30133/bin/HostX64/x86/ml.exe",
-    msvc_link_path = "C:/VS/VC/Tools/MSVC/14.29.30133/bin/HostX64/x86/link.exe",
-    msvc_lib_path = "C:/VS/VC/Tools/MSVC/14.29.30133/bin/HostX64/x86/lib.exe",
-    cxx_builtin_include_directories = [        "C:\\VS\\VC\\Tools\\MSVC\\14.29.30133\\include",
+    msvc_env_path = "C:\\VS\\VC\\Tools\\MSVC\\14.41.34120\\bin\\HostX64\\x86;C:\\VS\\VC\\Tools\\MSVC\\14.41.34120\\bin\\HostX64\\x64;C:\\VS\\Common7\\IDE\\VC\\VCPackages;C:\\VS\\Common7\\IDE\\CommonExtensions\\Microsoft\\TestWindow;C:\\VS\\MSBuild\\Current\\bin\\Roslyn;C:\\VS\\Common7\\IDE\\Extensions\\Microsoft\\CodeCoverage.Console;C:\\Program Files (x86)\\Windows Kits\\10\\bin\\10.0.20348.0\\\\x64;C:\\Program Files (x86)\\Windows Kits\\10\\bin\\\\x64;C:\\VS\\\\MSBuild\\Current\\Bin\\amd64;C:\\Windows\\Microsoft.NET\\Framework64\\v4.0.30319;C:\\VS\\Common7\\IDE\\;C:\\VS\\Common7\\Tools\\;;C:\\Windows\\system32;C:\\VS\\Common7\\IDE\\VC\\Linux\\bin\\ConnectionManagerExe",
+    msvc_env_include = "C:\\VS\\VC\\Tools\\MSVC\\14.41.34120\\include;C:\\VS\\VC\\Auxiliary\\VS\\include;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\ucrt;C:\\Program Files (x86)\\Windows Kits\\10\\\\include\\10.0.20348.0\\\\um;C:\\Program Files (x86)\\Windows Kits\\10\\\\include\\10.0.20348.0\\\\shared;C:\\Program Files (x86)\\Windows Kits\\10\\\\include\\10.0.20348.0\\\\winrt;C:\\Program Files (x86)\\Windows Kits\\10\\\\include\\10.0.20348.0\\\\cppwinrt",
+    msvc_env_lib = "C:\\VS\\VC\\Tools\\MSVC\\14.41.34120\\lib\\x86;C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.20348.0\\ucrt\\x86;C:\\Program Files (x86)\\Windows Kits\\10\\\\lib\\10.0.20348.0\\\\um\\x86",
+    msvc_cl_path = "C:/VS/VC/Tools/MSVC/14.41.34120/bin/HostX64/x86/cl.exe",
+    msvc_ml_path = "C:/VS/VC/Tools/MSVC/14.41.34120/bin/HostX64/x86/ml.exe",
+    msvc_link_path = "C:/VS/VC/Tools/MSVC/14.41.34120/bin/HostX64/x86/link.exe",
+    msvc_lib_path = "C:/VS/VC/Tools/MSVC/14.41.34120/bin/HostX64/x86/lib.exe",
+    cxx_builtin_include_directories = [        "C:\\VS\\VC\\Tools\\MSVC\\14.41.34120\\include",
+        "C:\\VS\\VC\\Auxiliary\\VS\\include",
         "C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\ucrt",
-        "C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\shared",
-        "C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\um",
-        "C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\winrt",
-        "C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.20348.0\\cppwinrt"],
+        "C:\\Program Files (x86)\\Windows Kits\\10\\\\include\\10.0.20348.0\\\\um",
+        "C:\\Program Files (x86)\\Windows Kits\\10\\\\include\\10.0.20348.0\\\\shared",
+        "C:\\Program Files (x86)\\Windows Kits\\10\\\\include\\10.0.20348.0\\\\winrt",
+        "C:\\Program Files (x86)\\Windows Kits\\10\\\\include\\10.0.20348.0\\\\cppwinrt"],
     tool_paths = {
-        "ar": "C:/VS/VC/Tools/MSVC/14.29.30133/bin/HostX64/x86/lib.exe",
-        "ml": "C:/VS/VC/Tools/MSVC/14.29.30133/bin/HostX64/x86/ml.exe",
-        "cpp": "C:/VS/VC/Tools/MSVC/14.29.30133/bin/HostX64/x86/cl.exe",
-        "gcc": "C:/VS/VC/Tools/MSVC/14.29.30133/bin/HostX64/x86/cl.exe",
+        "ar": "C:/VS/VC/Tools/MSVC/14.41.34120/bin/HostX64/x86/lib.exe",
+        "ml": "C:/VS/VC/Tools/MSVC/14.41.34120/bin/HostX64/x86/ml.exe",
+        "cpp": "C:/VS/VC/Tools/MSVC/14.41.34120/bin/HostX64/x86/cl.exe",
+        "gcc": "C:/VS/VC/Tools/MSVC/14.41.34120/bin/HostX64/x86/cl.exe",
         "gcov": "wrapper/bin/msvc_nop.bat",
-        "ld": "C:/VS/VC/Tools/MSVC/14.29.30133/bin/HostX64/x86/link.exe",
+        "ld": "C:/VS/VC/Tools/MSVC/14.41.34120/bin/HostX64/x86/link.exe",
         "nm": "wrapper/bin/msvc_nop.bat",
         "objcopy": "wrapper/bin/msvc_nop.bat",
         "objdump": "wrapper/bin/msvc_nop.bat",

third_party/toolchains/rbe_windows_bazel_7.3.1_vs2022/cc/get_env.bat

@@ -1,3 +1,3 @@
 @echo off
-call "C:\VS\VC\Auxiliary\Build\VCVARSALL.BAT" amd64  -vcvars_ver=14.29.30133 > NUL 
+call "C:\VS\VC\Auxiliary\Build\VCVARSALL.BAT" amd64  -vcvars_ver=14.41.34120 > NUL 
 echo PATH=%PATH%,INCLUDE=%INCLUDE%,LIB=%LIB%,WINDOWSSDKDIR=%WINDOWSSDKDIR% 

third_party/toolchains/rbe_windows_bazel_7.3.1_vs2022/config/BUILD

@@ -28,7 +28,7 @@ toolchain(
         "@platforms//os:windows",
         "@platforms//cpu:x86_64",
     ],
-    toolchain = "//third_party/toolchains/rbe_windows_bazel_7.3.1_vs2019/cc:cc-compiler-x64_windows",
+    toolchain = "//third_party/toolchains/rbe_windows_bazel_7.3.1_vs2022/cc:cc-compiler-x64_windows",
     toolchain_type = "@bazel_tools//tools/cpp:toolchain_type",
 )
 
@@ -40,7 +40,7 @@ platform(
         "@platforms//cpu:x86_64",
     ],
     exec_properties = {
-        "container-image": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/rbe_windows2019@sha256:1700f2ad0e7f5bdcafa56dce649720e6b12cf397e27990433871f11c75f68cb4",
+        "container-image": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/rbe_windows2019@sha256:5a97eb384a3089ac9180e6086ca89b1fdafa57735057624245b3d4a96b4744fe",
         "OSFamily": "Windows",
     },
 )