From 17700eca5b6288d166b37e339932223b372b5aef Mon Sep 17 00:00:00 2001
From: Elevations <153743901+ElevationsRPG@users.noreply.github.com>
Date: Wed, 11 Dec 2024 17:45:37 +1300
Subject: [PATCH 1/3] Update README.md

Update Windows README to use latest conan version and conan center.
---
 build/win32/README.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/build/win32/README.md b/build/win32/README.md
index 85fd868edb..5c8d1f59ac 100644
--- a/build/win32/README.md
+++ b/build/win32/README.md
@@ -18,10 +18,13 @@ The Windows build of libModSecurity uses Build Tools for Visual Studio 2022 (for
         * Windows SDK
         * CMake
         * Address Sanitizer
- * [Conan package manager 2.2.2](https://github.com/conan-io/conan/releases/download/2.2.2/conan-2.2.2-windows-x86_64-installer.exe)
+ * [Conan package manager 2.10.2](https://github.com/conan-io/conan/releases/download/2.10.2/conan-2.10.2-windows-x86_64-installer.exe)
     * Install and then setup the default Conan profile to use the MSVC C++ compiler:
       1. Open a command-prompt and set the MSVC C++ compiler environment by executing: `C:\BuildTools\VC\Auxiliary\Build\vcvars64.bat`
       2. Execute: `conan profile detect --force`
+      3. Make sure you are using latest conan center:
+        `conan remote list`
+        `conan remote update conan-center https://center.conan.io`
  * [Git for Windows 2.44.0](https://github.com/git-for-windows/git/releases/download/v2.44.0.windows.1/Git-2.44.0-64-bit.exe)
     * To clone the libModSecurity repository.
     * NOTE: Make sure to initialize and update submodules (to get `libinjection` and regression tests)
@@ -30,7 +33,7 @@ The Windows build of libModSecurity uses Build Tools for Visual Studio 2022 (for
 
 ## Build
 
-Install the prerequisites listsed in the previous section, checkout libModSecurity and from the directory where it's located execute:
+Install the prerequisites listed in the previous section, checkout libModSecurity and from the directory where it's located execute:
 
 ```
 vcbuild.bat [build_configuration] [arch] [USE_ASAN]

From 7b4c3a2c0fb2046ef72213107ae783f27790b90a Mon Sep 17 00:00:00 2001
From: Elevations <153743901+ElevationsRPG@users.noreply.github.com>
Date: Wed, 11 Dec 2024 19:06:59 +1300
Subject: [PATCH 2/3] Update Dockerfile

Update Docker to latest conan version 2.10.2
---
 build/win32/docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/win32/docker/Dockerfile b/build/win32/docker/Dockerfile
index a33d12f816..e01897904c 100644
--- a/build/win32/docker/Dockerfile
+++ b/build/win32/docker/Dockerfile
@@ -35,7 +35,7 @@ RUN %INSTALLER% /SP- /VERYSILENT /SUPPRESSMSGBOXES /NOCANCEL `
     /NORESTART /CLOSEAPPLICATIONS /RESTARTAPPLICATIONS /LOADINF=git.inf
 
 # download & setup conan
-ARG CONAN_VERSION=2.2.2
+ARG CONAN_VERSION=2.10.2
 ARG CONAN_BINARY=conan-${CONAN_VERSION}-windows-x86_64-installer.exe
 ARG CONAN_URL=https://github.com/conan-io/conan/releases/download/${CONAN_VERSION}/${CONAN_BINARY}
 

From c0681b6239dcd665484ebc677365c4acc8fa522b Mon Sep 17 00:00:00 2001
From: Elevations <153743901+ElevationsRPG@users.noreply.github.com>
Date: Wed, 11 Dec 2024 19:29:32 +1300
Subject: [PATCH 3/3] Update README.md

Remove conan center change
---
 build/win32/README.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/build/win32/README.md b/build/win32/README.md
index 5c8d1f59ac..2c9c11d06f 100644
--- a/build/win32/README.md
+++ b/build/win32/README.md
@@ -22,9 +22,6 @@ The Windows build of libModSecurity uses Build Tools for Visual Studio 2022 (for
     * Install and then setup the default Conan profile to use the MSVC C++ compiler:
       1. Open a command-prompt and set the MSVC C++ compiler environment by executing: `C:\BuildTools\VC\Auxiliary\Build\vcvars64.bat`
       2. Execute: `conan profile detect --force`
-      3. Make sure you are using latest conan center:
-        `conan remote list`
-        `conan remote update conan-center https://center.conan.io`
  * [Git for Windows 2.44.0](https://github.com/git-for-windows/git/releases/download/v2.44.0.windows.1/Git-2.44.0-64-bit.exe)
     * To clone the libModSecurity repository.
     * NOTE: Make sure to initialize and update submodules (to get `libinjection` and regression tests)