From 10edfe2abf2732801298cdb4ea0e8703fe0340a1 Mon Sep 17 00:00:00 2001
From: Don Olmstead <me@donolmstead.dev>
Date: Tue, 7 Oct 2025 15:11:51 -0700
Subject: [PATCH] Use WebKitDev to v0.6.2

Migrates from manual installers to chocolatey for package installation. Only git, ninja and nuget are not affected by this change.
---
 msbuild-2022/Dockerfile | 3 +--
 scripts/Dockerfile      | 2 +-
 tools/Dockerfile        | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/msbuild-2022/Dockerfile b/msbuild-2022/Dockerfile
index 56c5e57..c208e79 100644
--- a/msbuild-2022/Dockerfile
+++ b/msbuild-2022/Dockerfile
@@ -27,8 +27,7 @@ RUN Install-VSBuildTools2022 -InstallationPath C:\MSVS -Workloads `
 
 ENV LLVM_VERSION 20.1.4
 
-RUN Register-SystemPath -Path C:\LLVM\bin; `
-    Install-LLVM -Version $env:LLVM_VERSION -InstallationPath C:\LLVM;
+RUN Install-LLVM -Version $env:LLVM_VERSION -InstallationPath C:\LLVM;
 
 #--------------------------------------------------------------------
 # Install Debugging Tools for Windows
diff --git a/scripts/Dockerfile b/scripts/Dockerfile
index 0fdfc50..f348dab 100644
--- a/scripts/Dockerfile
+++ b/scripts/Dockerfile
@@ -43,7 +43,7 @@ RUN $scriptArgs = @{ `
 # Install WebKitDev Module
 #--------------------------------------------------------------------
 
-ENV WEBKIT_DEV_VERSION 0.5.2
+ENV WEBKIT_DEV_VERSION 0.6.2
 
 RUN $scriptArgs = @{ `
         Name = 'WebKitDev'; `
diff --git a/tools/Dockerfile b/tools/Dockerfile
index e26d0de..5b5f6aa 100644
--- a/tools/Dockerfile
+++ b/tools/Dockerfile
@@ -92,7 +92,7 @@ RUN Write-Host Write-Host 'Installing pywin32 ...'; `
 #--------------------------------------------------------------------
 
 # Locked version due to later versions not installing in container
-ENV RUBY_VERSION 3.1.3-1
+ENV RUBY_VERSION 3.1.3.1
 
 RUN Install-Ruby -Version $env:RUBY_VERSION -InstallationPath C:\tools\ruby;
 
@@ -135,7 +135,7 @@ RUN Install-NuGet -Version $env:NUGET_VERSION -InstallationPath C:\tools\nuget;
 # Locked version due to later versions not installing in container
 ENV XAMPP_VERSION 8.1.6
 
-RUN choco install xampp-81 --confirm --version=$env:XAMPP_VERSION; `
+RUN Install-Xampp -Version $env:XAMPP_VERSION; `
     Update-XamppPerlLocation -perlPath C:\tools\perl; `
     Update-XamppPythonLocation -pythonPath C:\tools\python3;