Update windows "ReDist" devkit creation doc (#4303)

* Update windows devkit creation doc

Signed-off-by: Andrew Leonard <[email protected]>

* Update windows devkit creation doc

Signed-off-by: Andrew Leonard <[email protected]>

* Update windows devkit creation doc

Signed-off-by: Andrew Leonard <[email protected]>

* Update windows devkit creation doc

Signed-off-by: Andrew Leonard <[email protected]>

* Update windows devkit creation doc

Signed-off-by: Andrew Leonard <[email protected]>

* Update windows devkit creation doc

Signed-off-by: Andrew Leonard <[email protected]>

* Update windows devkit creation doc

Signed-off-by: Andrew Leonard <[email protected]>

* Update windows devkit creation doc

Signed-off-by: Andrew Leonard <[email protected]>

---------

Signed-off-by: Andrew Leonard <[email protected]>

Author: andrew-m-leonard

docs/CreateWindowsReDistDevKit.md

@@ -8,21 +8,26 @@ release can be identically reproduced including the VS Redistributable DLLs.
 
 To extract the required Redist DLLs, the safest and easiest way is to locally install an "all architecture" installation of Visual Studio and the Windows SDK as follows:
 
-### Install required version of Visual Studio and WIndows SDK
+### Install required version of Visual Studio and Windows SDK
 
 1. Determine the "Build Tools" version install bootstrapper required and download from here: https://learn.microsoft.com/en-us/visualstudio/releases/2022/release-history#fixed-version-bootstrappers
 
+- If re-building an existing ReDist devkit, for the required VS Toolset version check the versions for the release: https://github.com/adoptium/devkit-binaries/releases
+- eg. "vs2022_redist_14.40.33807_10.0.26100.1742", is VS2022 version 17.10.3, containing MS Toolset version "14.40.33807"
+
 2. Install locally Visual Studio on a Windows x64 VM using the following command:
 
 ```sh
 ./vs_BuildTools.exe --passive --norestart --wait --arch all --add "Microsoft.VisualStudio.Workload.NativeDesktop;includeRecommended;includeOptional" --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.Component.VC.Tools.ARM64 --add Microsoft.VisualStudio.Component.VC.ATL.ARM64 --add Microsoft.VisualStudio.Component.VC.MFC.ARM64
 ```
 
-3. Determine the required version of the "Windows SDK" from here: https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/
+3. Install the required version of the "Windows SDK"
+
+- If re-building an existing ReDist devkit, for the required "Windows SDK" version check the versions for the release: https://github.com/adoptium/devkit-binaries/releases
 
-- Note the point version, eg."10.0.26100.1742"
+  - eg. "vs2022_redist_14.40.33807_10.0.26100.1742", is SDK version "10.0.26100.1742".
 
-- Download the Windows SDK "Installer" from this page
+- Download the Windows SDK "Installer" from the SDK download (https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/), or archives (https://developer.microsoft.com/en-us/windows/downloads/sdk-archive/index-legacy).
 
 4. Run the Windows SDK "Installer" locally to install the required Windows SDK Redist UCRT DLLs
 
@@ -32,18 +37,18 @@ To extract the required Redist DLLs, the safest and easiest way is to locally in
 
 ```sh
 devkit.info
-arm64/
+arm64\
     <arm64 ReDist DLLS>
-x64/
+x64\
     <x64 ReDist DLLS>
-x86/
+x86\
     <x86 ReDist DLLS>
-ucrt/DLLs/
-    arm64/
+ucrt\DLLs\
+    arm64\
          <arm64 UCRT DLLs>
-    x64/ 
+    x64\
          <x64 UCRT DLLs>
-    x86/ 
+    x86\ 
          <x86 UCRT DLLs>
 ```
 
@@ -66,19 +71,19 @@ C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Redist\MSVC\xx
 3. Copy the following MSVC Redist DLLs for each architecture (arm64, x64, x86) from the MSVC Redist folders into the temporary directory you created:
 
 ```sh
-cp C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Redist\MSVC\xx.yy.zzzzz\arm64\Microsoft.VC143.CRT\vcruntime140.dll win_devkit/arm64
-cp C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Redist\MSVC\xx.yy.zzzzz\arm64\Microsoft.VC143.CRT\vcruntime140_1.dll win_devkit/arm64
-cp C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Redist\MSVC\xx.yy.zzzzz\arm64\Microsoft.VC143.CRT\msvcp140.dll win_devkit/arm64
+copy "C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Redist\MSVC\xx.yy.zzzzz\arm64\Microsoft.VC143.CRT\vcruntime140.dll" win_devkit/arm64
+copy "C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Redist\MSVC\xx.yy.zzzzz\arm64\Microsoft.VC143.CRT\vcruntime140_1.dll" win_devkit/arm64
+copy "C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Redist\MSVC\xx.yy.zzzzz\arm64\Microsoft.VC143.CRT\msvcp140.dll" win_devkit/arm64
 
-cp C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Redist\MSVC\xx.yy.zzzzz\x64\Microsoft.VC143.CRT\vcruntime140.dll win_devkit/x64
-cp C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Redist\MSVC\xx.yy.zzzzz\x64\Microsoft.VC143.CRT\vcruntime140_1.dll win_devkit/x64
-cp C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Redist\MSVC\xx.yy.zzzzz\x64\Microsoft.VC143.CRT\msvcp140.dll win_devkit/x64
+copy "C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Redist\MSVC\xx.yy.zzzzz\x64\Microsoft.VC143.CRT\vcruntime140.dll" win_devkit/x64
+copy "C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Redist\MSVC\xx.yy.zzzzz\x64\Microsoft.VC143.CRT\vcruntime140_1.dll" win_devkit/x64
+copy "C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Redist\MSVC\xx.yy.zzzzz\x64\Microsoft.VC143.CRT\msvcp140.dll" win_devkit/x64
 
-cp C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Redist\MSVC\xx.yy.zzzzz\x86\Microsoft.VC143.CRT\vcruntime140.dll win_devkit/x86
-cp C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Redist\MSVC\xx.yy.zzzzz\x86\Microsoft.VC143.CRT\msvcp140.dll win_devkit/x86
+copy "C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Redist\MSVC\xx.yy.zzzzz\x86\Microsoft.VC143.CRT\vcruntime140.dll" win_devkit/x86
+copy "C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Redist\MSVC\xx.yy.zzzzz\x86\Microsoft.VC143.CRT\msvcp140.dll" win_devkit/x86
 ```
 
-4. Find the correct Windows Kit UCRT folder, it should be located under folder:
+4. Find the correct Windows Kit UCRT Redist folder with the files installed by the SDK Installer. Note, if the SDK is installed from a specific SDK installer, then the Redist folder it installed into will likely be ".0", not necessarily the eg.".1742" SDK installer version:
 
 ```sh
 C:\Program Files (x86)\Windows Kits\10\Redist\10.0.xxxxx.0\ucrt
@@ -87,15 +92,16 @@ C:\Program Files (x86)\Windows Kits\10\Redist\10.0.xxxxx.0\ucrt
 5. Copy the entire "ucrt" sub-folder containing the DLLs/(arm64, x64, x86), eg.
 
 ```sh
-cp -r "Program Files (x86)/Windows Kits/10/Redist/10.0.26100.0/ucrt" win_devkit
+mkdir win_devkit\ucrt
+xcopy /s "c:\Program Files (x86)\Windows Kits\10\Redist\10.0.xxxxx.0\ucrt\*" win_devkit\ucrt
 ```
 
 6. Create the required devkit.info metadata file with the following content:
 
 The ADOPTIUM_DEVKIT_RELEASE must match the desired published https://github.com/adoptium/devkit-binaries/releases tag. The chosen format for a release tag is vs2022_redist_&lt;VS version&gt;_&lt;SDK version&gt;, eg.
 
 ```sh
-ADOPTIUM_DEVKIT_RELEASE=vs2022_redist_14.40.33807_10.0.26100.0
+ADOPTIUM_DEVKIT_RELEASE=vs2022_redist_14.40.33807_10.0.26100.1742
 ```
 
 7. Zip the contents