From a41bccc6bcaa9d63df52a41fdec5aa723200d04c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20M=2E=20Nieves?= <jose.nieves@gmail.com>
Date: Thu, 25 Apr 2024 14:08:14 -0500
Subject: [PATCH] Fixing merge horrors and setting up SDK versions.

---
 Code/Tools/FBuild/FBuildCore/Helpers/Compressor.h    |  3 ---
 Code/Tools/FBuild/FBuildWorker/FBuildWorkerOptions.h |  3 ---
 External/SDK/VisualStudio/VS2022.bff                 | 12 ++++++------
 External/SDK/Windows/Windows10SDK.bff                |  8 ++++----
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/Code/Tools/FBuild/FBuildCore/Helpers/Compressor.h b/Code/Tools/FBuild/FBuildCore/Helpers/Compressor.h
index c471ac2cb..3ec2707ef 100644
--- a/Code/Tools/FBuild/FBuildCore/Helpers/Compressor.h
+++ b/Code/Tools/FBuild/FBuildCore/Helpers/Compressor.h
@@ -28,9 +28,6 @@ class Compressor
 
     // Decompress (handled all formats including uncompressed)
     bool Decompress( const void * data );
-
-    // Zstd
-    bool CompressZstd( const void * data, size_t dataSize, int32_t compressionLevel = -1 ); // -1 = default Zstd compression level
     bool DecompressZstd( const void * data );
 
     const void *    GetResult() const       { return m_Result; }
diff --git a/Code/Tools/FBuild/FBuildWorker/FBuildWorkerOptions.h b/Code/Tools/FBuild/FBuildWorker/FBuildWorkerOptions.h
index 3573437ad..4af424539 100644
--- a/Code/Tools/FBuild/FBuildWorker/FBuildWorkerOptions.h
+++ b/Code/Tools/FBuild/FBuildWorker/FBuildWorkerOptions.h
@@ -41,9 +41,6 @@ class FBuildWorkerOptions
     // Other
     bool m_PeriodicRestart;
 
-    // Other
-    bool m_PeriodicRestart;
-
 private:
     void ShowUsageError();
 };
diff --git a/External/SDK/VisualStudio/VS2022.bff b/External/SDK/VisualStudio/VS2022.bff
index 0a45ecc05..5da8e7bee 100644
--- a/External/SDK/VisualStudio/VS2022.bff
+++ b/External/SDK/VisualStudio/VS2022.bff
@@ -8,12 +8,12 @@
 //  2) Specified via environment variables (VS Command Prompt)
 //  3) Part of a Visual Studio installation (Program Files)
 //
-#if file_exists( "2022/Community/VC/Tools/MSVC/14.38.33130/bin/Hostx64/x64/cl.exe" )
+#if file_exists( "2022/Community/VC/Tools/MSVC/14.39.33519/bin/Hostx64/x64/cl.exe" )
     //
     // Use vendorized toolchain - v17.8.3
     //
     .VS2022_BasePath        = '$_CURRENT_BFF_DIR_$/2022/Community/VC'
-    .VS2022_Version         = '14.38.33130'
+    .VS2022_Version         = '14.39.33519'
     .VS2022_MSC_VER         = '1938'
 #else
     //
@@ -29,19 +29,19 @@
         //
         // Use Visual Studio installation
         //
-        #if file_exists( "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/MSVC/14.38.33130/bin/Hostx64/x64/cl.exe" )
+        #if file_exists( "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/MSVC/14.39.33519/bin/Hostx64/x64/cl.exe" )
             // v17.8.3
             .VS2022_BasePath        = 'C:/Program Files/Microsoft Visual Studio/2022/Community/VC'
-            .VS2022_Version         = '14.38.33130'
+            .VS2022_Version         = '14.39.33519'
             .VS2022_MSC_VER         = '1938'
         #else
             //
             // Use Visual Studio 2022 Enterprise installation (used by GitHub Actions)
             //
-            #if file_exists( "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Tools/MSVC/14.38.33130/bin/Hostx64/x64/cl.exe" )
+            #if file_exists( "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Tools/MSVC/14.39.33519/bin/Hostx64/x64/cl.exe" )
                 // v17.8.3
                 .VS2022_BasePath        = 'C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC'
-                .VS2022_Version         = '14.38.33130'
+                .VS2022_Version         = '14.39.33519'
                 .VS2022_MSC_VER         = '1938'
             #else
                 //
diff --git a/External/SDK/Windows/Windows10SDK.bff b/External/SDK/Windows/Windows10SDK.bff
index 9e987ece1..d1ab82970 100644
--- a/External/SDK/Windows/Windows10SDK.bff
+++ b/External/SDK/Windows/Windows10SDK.bff
@@ -7,19 +7,19 @@
 //  1) Vendorized in External (side by side with this bff)
 //  2) Part of a Windows 10 installation (Program Files)
 //
-#if file_exists( "10\bin\10.0.19041.0\x64\RC.exe" )
+#if file_exists( "10\bin\10.0.22621.0\x64\RC.exe" )
     //
     // Use vendorized toolchain
     //
     .Windows10_SDKBasePath        = '$_CURRENT_BFF_DIR_$\10'
-    .Windows10_SDKVersion         = '10.0.19041.0'
+    .Windows10_SDKVersion         = '10.0.22621.0'
 #else
     //
     // Use Windows10SDK installation
     //
-    #if file_exists( "C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\RC.exe" )
+    #if file_exists( "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x64\RC.exe" )
         .Windows10_SDKBasePath        = 'C:\Program Files (x86)\Windows Kits\10'
-        .Windows10_SDKVersion         = '10.0.19041.0'
+        .Windows10_SDKVersion         = '10.0.22621.0'
     #else
         //
         // Failed