From 0765dc7eb87fe22d17711c43e1e86f518cd5f4fa Mon Sep 17 00:00:00 2001
From: usernameak <usernameak@protonmail.com>
Date: Fri, 20 Jun 2025 04:23:01 +0200
Subject: [PATCH] Fix crash when using AdditionalManifestFiles on 32-bit
 Windows targets

---
 .../Windows/BaseWindowsPlatform.cs                         | 7 +++++++
 .../Sharpmake.CommonPlatforms/Windows/Win64Platform.cs     | 5 -----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Windows/BaseWindowsPlatform.cs b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Windows/BaseWindowsPlatform.cs
index 43bea64fe..98245a5ff 100644
--- a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Windows/BaseWindowsPlatform.cs
+++ b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Windows/BaseWindowsPlatform.cs
@@ -12,6 +12,13 @@ public static partial class Windows
     {
         public abstract class BaseWindowsPlatform : BaseMicrosoftPlatform, IWindowsFastBuildCompilerSettings
         {
+            #region IPlatformDescriptor implementation
+            public override EnvironmentVariableResolver GetPlatformEnvironmentResolver(params VariableAssignment[] assignments)
+            {
+                return new Win64EnvironmentVariableResolver(assignments);
+            }
+            #endregion
+            
             #region IWindowsFastBuildCompilerSettings implementation
             public override bool IsPcPlatform => true;
             public IDictionary<DevEnv, string> BinPath { get; set; } = new Dictionary<DevEnv, string>();
diff --git a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Windows/Win64Platform.cs b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Windows/Win64Platform.cs
index 0a9dac7e5..3e1ed6bf7 100644
--- a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Windows/Win64Platform.cs
+++ b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Windows/Win64Platform.cs
@@ -26,11 +26,6 @@ public sealed class Win64Platform : BaseWindowsPlatform
             #region IPlatformDescriptor implementation
             public override string SimplePlatformString => "Win64";
             public override string GetToolchainPlatformString(ITarget target) => "x64";
-
-            public override EnvironmentVariableResolver GetPlatformEnvironmentResolver(params VariableAssignment[] assignments)
-            {
-                return new Win64EnvironmentVariableResolver(assignments);
-            }
             #endregion
 
             #region IMicrosoftPlatformBff implementation