Using suggested MSVC build tools version for latest UE versions

Author: Alexey31rus

src/ue4docker/build.py

@@ -408,6 +408,8 @@ def build():
                         "--build-arg",
                         "VISUAL_STUDIO_BUILD_NUMBER="
                         + config.visualStudio.build_number,
+                        "--build-arg",
+                        "UE_VERSION=" + config.release,
                     ]
 
                 custom_prerequisites_dockerfile = config.args.prerequisites_dockerfile

src/ue4docker/dockerfiles/ue4-build-prerequisites/windows/Dockerfile

@@ -61,4 +61,5 @@ RUN powershell -NoProfile -ExecutionPolicy Bypass -Command "$env:chocolateyVersi
 # Install the rest of our build prerequisites and clean up afterwards to minimise image size
 COPY install-prerequisites.ps1 C:\
 ARG VISUAL_STUDIO_BUILD_NUMBER
-RUN powershell -ExecutionPolicy Bypass -File C:\install-prerequisites.ps1 %VISUAL_STUDIO_BUILD_NUMBER%
+ARG UE_VERSION
+RUN powershell -ExecutionPolicy Bypass -File C:\install-prerequisites.ps1 %VISUAL_STUDIO_BUILD_NUMBER% %UE_VERSION%

src/ue4docker/dockerfiles/ue4-build-prerequisites/windows/install-prerequisites.ps1

@@ -55,14 +55,32 @@ Expand-Archive -Path "$env:TEMP\vulkan-runtime-components.zip" -DestinationPath
 Copy-Item -Path "*\x64\vulkan-1.dll" -Destination C:\Windows\System32\
 
 $visual_studio_build = $args[0]
+$unreal_engine_version = $args[1]
+
+Write-Host "Unreal Engine version: $unreal_engine_version"
 
 if ($visual_studio_build -eq "15")
 {
     $windows_sdk_version = 18362
+    $windows_os_version = "Windows10SDK"
 }
 else
 {
     $windows_sdk_version = 20348
+    $windows_os_version = "Windows10SDK"
+
+    # NOTE: See suggested components https://github.com/EpicGames/UnrealEngine/blob/release/Engine/Config/Windows/Windows_SDK.json
+    if ($unreal_engine_version.StartsWith("5.4"))
+    {
+        $windows_sdk_version = 22621
+        $vs_tools_version = "14.38.17.8"
+    }
+    elseif ($unreal_engine_version.StartsWith("5.5"))
+    {
+        $windows_sdk_version = 22621
+        $windows_os_version = "Windows11SDK"
+        $vs_tools_version = "14.38.17.8"
+    }
 }
 
 # NOTE: We use the Visual Studio 2022 installer even for Visual Studio 2019 and 2017 here because the old (2017) installer now breaks
@@ -85,15 +103,26 @@ $vs_args = @(
     "--add", "Microsoft.VisualStudio.Workload.VCTools",
     "--add", "Microsoft.VisualStudio.Workload.MSBuildTools",
     "--add", "Microsoft.VisualStudio.Component.NuGet",
-    "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
-    "--add", "Microsoft.VisualStudio.Component.Windows10SDK.$windows_sdk_version",
+    "--add", "Microsoft.VisualStudio.Component.$windows_os_version.$windows_sdk_version",
     "--add", "Microsoft.Net.Component.4.5.TargetingPack",
     "--add", "Microsoft.Net.Component.4.6.2.TargetingPack",
     "--add", "Microsoft.Net.ComponentGroup.DevelopmentPrerequisites",
     "--add", "Microsoft.NetCore.Component.SDK",
     "--add", "Microsoft.NetCore.Component.Runtime.3.1"
 )
 
+if (-not ([string]::IsNullOrEmpty($vs_tools_version))) {
+    $vs_args = $vs_args,
+    "--add", "Microsoft.VisualStudio.Component.VC.$vs_tools_version.x86.x64",
+    "--remove", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
+    "--remove", "Microsoft.VisualStudio.Component.Windows10SDK.20348"
+}
+else
+{
+    $vs_args = $vs_args,
+    "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64"
+}
+
 # Install the Visual Studio Build Tools workloads and components we need
 RunProcessChecked "$env:TEMP\vs_buildtools.exe" $vs_args