Update VS installation instructions

Author: MisterDA

src-opam/Install.cmd

@@ -12,3 +12,5 @@ if "%ERRORLEVEL%"=="3010" (
         exit /b !ERR!
     )
 )
+
+exit /b 0

src-opam/opam.ml

@@ -476,6 +476,7 @@ let windows_msvc_opam2 ?win10_revision ?winget ?(labels = []) ~opam_hashes
       Windows.install_visual_studio_build_tools
         [
           "Microsoft.VisualStudio.Component.VC.Tools.x86.x64";
+          (* Without 18362, rc.exe is missing from the Path. *)
           "Microsoft.VisualStudio.Component.Windows10SDK.18362";
         ] )
   in

src-opam/windows.ml

@@ -60,33 +60,47 @@ let install_vc_redist ?(vs_version = "17") ?(arch = `X86_64) () =
   |> cleanup
 
 let install_visual_studio_build_tools ?(vs_version = "17") components =
-  let install =
-    let fmt =
-      format_of_string
-        {|C:\TEMP\Install.cmd C:\TEMP\vs_buildtools.exe --quiet --wait --norestart --nocache `
-        --installPath C:\BuildTools --channelUri C:\TEMP\VisualStudio.chman `
-        --installChannelUri C:\TEMP\VisualStudio.chman%s|}
-    in
-    run fmt
-      (List.fold_left
-         (fun acc component -> acc ^ " `\n        --add " ^ component)
-         "" components)
+  (* https://learn.microsoft.com/en-us/visualstudio/install/advanced-build-tools-container?view=vs-2022#dockerfile *)
+  let excluded_components =
+    (* Exclude workloads and components with known issues *)
+    [
+      "Microsoft.VisualStudio.Component.Windows10SDK.10240";
+      "Microsoft.VisualStudio.Component.Windows10SDK.10586";
+      "Microsoft.VisualStudio.Component.Windows10SDK.14393";
+      "Microsoft.VisualStudio.Component.Windows81SDK";
+    ]
+  in
+  let pp cmd components =
+    let buf = Buffer.create 512 in
+    List.iter
+      (fun component ->
+        Buffer.add_string buf " `\n        --";
+        Buffer.add_string buf cmd;
+        Buffer.add_char buf ' ';
+        Buffer.add_string buf component)
+      components;
+    Buffer.contents buf
   in
-  (* https://docs.microsoft.com/en-us/visualstudio/install/advanced-build-tools-container?view=vs-2019#install-script *)
   add
     ~src:
       [
+        (* https://learn.microsoft.com/en-us/visualstudio/install/advanced-build-tools-container?view=vs-2022#install-script *)
         "https://raw.githubusercontent.com/ocurrent/ocaml-dockerfile/master/src-opam/Install.cmd";
       ]
     ~dst:{|C:\TEMP\|} ()
   @@ add ~src:[ "https://aka.ms/vscollect.exe" ] ~dst:{|C:\TEMP\collect.exe|} ()
   @@ add
        ~src:[ "https://aka.ms/vs/" ^ vs_version ^ "/release/channel" ]
        ~dst:{|C:\TEMP\VisualStudio.chman|} ()
-  @@ add
-       ~src:[ "https://aka.ms/vs/" ^ vs_version ^ "/release/vs_buildtools.exe" ]
-       ~dst:{|C:\TEMP\vs_buildtools.exe|} ()
-  @@ install
+  @@ run
+       {|curl -SL --output C:\TEMP\vs_buildtools.exe https://aka.ms/vs/%s/release/vs_buildtools.exe `
+    && (call C:\TEMP\Install.cmd C:\TEMP\vs_buildtools.exe --quiet --wait --norestart --nocache install `
+        --installPath "%%ProgramFiles(x86)%%\Microsoft Visual Studio\2022\BuildTools" `
+        --channelUri C:\TEMP\VisualStudio.chman `
+        --installChannelUri C:\TEMP\VisualStudio.chman%s%s) `
+    && del /q C:\TEMP\vs_buildtools.exe|}
+       vs_version (pp "add" components)
+       (pp "remove" excluded_components)
 
 let header ~alias ?win10_revision
     ?(version =

src-opam/windows.mli

@@ -51,13 +51,17 @@ val sanitize_reg_path : unit -> t
 /usr/bin/bash: -c: line 1: syntax error: unexpected end of file
     v} |}]
 
-val install_vc_redist : ?vs_version:string -> ?arch:Ocaml_version.arch -> unit -> t
+val install_vc_redist :
+  ?vs_version:string -> ?arch:Ocaml_version.arch -> unit -> t
 (** Install Microsoft Visual C++ Redistributable.
     @see <https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads> *)
 
 val install_visual_studio_build_tools : ?vs_version:string -> string list -> t
 (** Install Visual Studio Build Tools components.
-    @see <https://docs.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-build-tools?view=vs-2019> *)
+
+    @see <https://learn.microsoft.com/en-us/visualstudio/install/build-tools-container?view=vs-2022>
+    @see <https://learn.microsoft.com/en-us/visualstudio/install/build-tools-container-issues?view=vs-2022>
+    @see <https://docs.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-build-tools?view=vs-2022> *)
 
 val ocaml_for_windows_package_exn :
   switch:Ocaml_version.t ->