From 82aefc3993b0ef279835a7081d63c7bd69ff9544 Mon Sep 17 00:00:00 2001
From: Jan Dupej <jandupej@microsoft.com>
Date: Wed, 2 Oct 2024 16:09:54 +0200
Subject: [PATCH 1/3] Add boost 1.83 and vc 14.3 to build CI scripts.

---
 .../linux/image-builder/build_boosts.zsh      |  2 +-
 .../ci-scripts/windows/Get-BoostLocation.ps1  |  2 +-
 tools/ci-scripts/windows/Install-Boost.ps1    | 29 ++++++++++++++-----
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/tools/ci-scripts/linux/image-builder/build_boosts.zsh b/tools/ci-scripts/linux/image-builder/build_boosts.zsh
index 75d2762492..f725e0d4d9 100755
--- a/tools/ci-scripts/linux/image-builder/build_boosts.zsh
+++ b/tools/ci-scripts/linux/image-builder/build_boosts.zsh
@@ -2,7 +2,7 @@
 
 set -eux
 
-BOOST_VERSIONS=(1.61.0 1.62.0 1.63.0 1.64.0 1.65.1 1.66.0 1.67.0)
+BOOST_VERSIONS=(1.61.0 1.62.0 1.63.0 1.64.0 1.65.1 1.66.0 1.67.0 1.83.0)
 BOOST_LIBRARIES="chrono,date_time,python,system,test,thread"
 
 BUILD_ROOT=/tmp/boosts
diff --git a/tools/ci-scripts/windows/Get-BoostLocation.ps1 b/tools/ci-scripts/windows/Get-BoostLocation.ps1
index 808c787ce4..cbb8f1cf15 100644
--- a/tools/ci-scripts/windows/Get-BoostLocation.ps1
+++ b/tools/ci-scripts/windows/Get-BoostLocation.ps1
@@ -22,7 +22,7 @@ param
     [string]
     $Version,
 
-    [ValidateSet('12.0', '14.0', '14.1', '14.2')]
+    [ValidateSet('12.0', '14.0', '14.1', '14.2', '14.3')]
     [string]
     $VcToolsetVer
 )
diff --git a/tools/ci-scripts/windows/Install-Boost.ps1 b/tools/ci-scripts/windows/Install-Boost.ps1
index e44b17bc25..2c81582e46 100644
--- a/tools/ci-scripts/windows/Install-Boost.ps1
+++ b/tools/ci-scripts/windows/Install-Boost.ps1
@@ -28,7 +28,7 @@ param
     [string]
     $Version,
 
-    [ValidateSet('12.0', '14.0', '14.1', '14.2')]
+    [ValidateSet('12.0', '14.0', '14.1', '14.2', '14.3')]
     [string]
     $VcToolsetVer,
     
@@ -123,13 +123,26 @@ function Install-BoostComponent([string]$Component)
             -InstallDir $workDir `
             -PackageVersion $Version
 
-        Move-Item `
-            -Path ([System.IO.Path]::Combine($workDir, $packageId, 'lib', 'native', 'address-model-32', 'lib', '*')) `
-            -Destination $lib32Dir
-
-        Move-Item `
-            -Path ([System.IO.Path]::Combine($workDir, $packageId, 'lib', 'native', 'address-model-64', 'lib', '*')) `
-            -Destination $lib64Dir
+        if ($Version -gt 1.66)
+        {
+            $sourceFolder = ([System.IO.Path]::Combine($workDir, $packageId, 'lib', 'native'))
+            $itemsToMove32 = Get-ChildItem -Path $sourceFolder | Where-Object { $_.Name -like "*x32*" }
+            $itemsToMove64 = Get-ChildItem -Path $sourceFolder | Where-Object { $_.Name -like "*x64*" }
+            
+            $itemsToMove32 | ForEach-Object { Move-Item -Path $_.FullName -Destination $lib32Dir }
+            $itemsToMove64 | ForEach-Object { Move-Item -Path $_.FullName -Destination $lib64Dir }
+
+        } 
+        else 
+        {
+            Move-Item `
+                -Path ([System.IO.Path]::Combine($workDir, $packageId, 'lib', 'native', 'address-model-64', 'lib', '*')) `
+                -Destination $lib64Dir
+
+            Move-Item `
+                -Path ([System.IO.Path]::Combine($workDir, $packageId, 'lib', 'native', 'address-model-32', 'lib', '*')) `
+                -Destination $lib32Dir   
+        }
     }
 }
 

From 7227944779d5092dbc2e835afe9bb16997aa7ba7 Mon Sep 17 00:00:00 2001
From: Jan Dupej <jandupej@microsoft.com>
Date: Wed, 2 Oct 2024 16:12:05 +0200
Subject: [PATCH 2/3] Fix random number generation.

---
 examples/cpp/core/multiprecision/multiprecision.cpp | 1 +
 examples/cpp/core/multiprecision/multiprecision.h   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/examples/cpp/core/multiprecision/multiprecision.cpp b/examples/cpp/core/multiprecision/multiprecision.cpp
index a911c19312..ed03b93218 100644
--- a/examples/cpp/core/multiprecision/multiprecision.cpp
+++ b/examples/cpp/core/multiprecision/multiprecision.cpp
@@ -4,6 +4,7 @@
 #include <bond/stream/output_buffer.h>
 
 #include <boost/multiprecision/miller_rabin.hpp>
+#include <boost/random.hpp>
 
 using namespace examples::multiprecision;
 
diff --git a/examples/cpp/core/multiprecision/multiprecision.h b/examples/cpp/core/multiprecision/multiprecision.h
index 133e1f00a4..cc5967af91 100644
--- a/examples/cpp/core/multiprecision/multiprecision.h
+++ b/examples/cpp/core/multiprecision/multiprecision.h
@@ -75,7 +75,7 @@ namespace bond
             // Bond expects that blob with default value is empty
             return 0;
         else
-            return num.backend().size() * sizeof(limb_type);
+            return static_cast<uint32_t>(num.backend().size() * sizeof(limb_type));
     }
 
 

From 0fa934e91c03f81740d715c69c6051904560adbb Mon Sep 17 00:00:00 2001
From: Jan Dupej <jandupej@microsoft.com>
Date: Wed, 2 Oct 2024 16:20:18 +0200
Subject: [PATCH 3/3] Updated the change log.

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e59c2b54e..57dc25255f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,6 +45,7 @@ different versioning scheme, following the Haskell community's
   runtime if custom allocators for containers are used. Newer MSVC versions and
   other compilers are not affected, neither are Release builds with MSVC 14.0. This
   can be worked around by using newer MSVC version or building in Release configuration.
+* Added support for Boost 1.83.
 
 ### C# ###