From 806529aa77e1977360cd3885b595797bea98e920 Mon Sep 17 00:00:00 2001
From: Mikael Vidstedt <mikael@openjdk.org>
Date: Tue, 7 Nov 2023 17:13:47 +0000
Subject: [PATCH] 8319573: Change to Visual Studio 17.6.5 for building on
 Windows at Oracle

Reviewed-by: erikj
---
 doc/building.html         |  2 +-
 doc/building.md           | 10 +++++-----
 make/conf/jib-profiles.js |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/building.html b/doc/building.html
index 3601fa8af16..3d6df55fa12 100644
--- a/doc/building.html
+++ b/doc/building.html
@@ -548,7 +548,7 @@ to compile successfully without issues.</p>
 </tr>
 <tr class="odd">
 <td>Windows</td>
-<td>Microsoft Visual Studio 2022 update 17.1.0</td>
+<td>Microsoft Visual Studio 2022 version 17.6.5</td>
 </tr>
 </tbody>
 </table>
diff --git a/doc/building.md b/doc/building.md
index 68c65bf0517..aff2a1abe9c 100644
--- a/doc/building.md
+++ b/doc/building.md
@@ -334,11 +334,11 @@ possible to compile the JDK with both older and newer versions, but the closer
 you stay to this list, the more likely you are to compile successfully without
 issues.
 
-| Operating system   | Toolchain version                          |
-| ------------------ | ------------------------------------------ |
-| Linux              | gcc 11.2.0                                 |
-| macOS              | Apple Xcode 14.3.1 (using clang 14.0.3)    |
-| Windows            | Microsoft Visual Studio 2022 update 17.1.0 |
+| Operating system   | Toolchain version                           |
+| ------------------ | ------------------------------------------- |
+| Linux              | gcc 11.2.0                                  |
+| macOS              | Apple Xcode 14.3.1 (using clang 14.0.3)     |
+| Windows            | Microsoft Visual Studio 2022 version 17.6.5 |
 
 All compilers are expected to be able to compile to the C99 language standard,
 as some C99 features are used in the source code. Microsoft Visual Studio
diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
index e81b6715a48..e038dbd9006 100644
--- a/make/conf/jib-profiles.js
+++ b/make/conf/jib-profiles.js
@@ -1087,7 +1087,7 @@ var getJibProfilesDependencies = function (input, common) {
     var devkit_platform_revisions = {
         linux_x64: "gcc11.2.0-OL6.4+1.0",
         macosx: "Xcode14.3.1+1.0",
-        windows_x64: "VS2022-17.1.0+1.1",
+        windows_x64: "VS2022-17.6.5+1.0",
         linux_aarch64: input.build_cpu == "x64" ? "gcc11.2.0-OL7.6+1.1" : "gcc11.2.0-OL7.6+1.0",
         linux_arm: "gcc8.2.0-Fedora27+1.0",
         linux_ppc64le: "gcc8.2.0-Fedora27+1.0",