Merge branch 'dev' into fix/VCST-410-decimal-setting-allow-empty-string

Author: AlexTzykin

Directory.Build.props

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <VersionPrefix>3.806.0</VersionPrefix>
+    <VersionPrefix>3.807.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
     <NoWarn>$(NoWarn);S3875;S4457</NoWarn>

src/VirtoCommerce.Platform.Modules/Local/LocalStorageModuleCatalog.cs

@@ -3,6 +3,7 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using VirtoCommerce.Platform.Core.Common;
@@ -151,7 +152,7 @@ public override void Validate()
                                                             .ToArray();
                     if (installedIncompatibilities.Any())
                     {
-                        module.Errors.Add($"{ module } is incompatible with installed { string.Join(", ", installedIncompatibilities.Select(x => x.ToString())) }. You should uninstall these modules first.");
+                        module.Errors.Add($"{module} is incompatible with installed {string.Join(", ", installedIncompatibilities.Select(x => x.ToString()))}. You should uninstall these modules first.");
                     }
                 }
 
@@ -284,7 +285,12 @@ private void CopyFile(string sourceFilePath, string targetFilePath)
             }
 
             var versionsAreSameButLaterDate = (sourceVersion == targetVersion && targetFileInfo.Exists && sourceFileInfo.Exists && targetFileInfo.LastWriteTimeUtc < sourceFileInfo.LastWriteTimeUtc);
-            if (!targetFileInfo.Exists || sourceVersion > targetVersion || versionsAreSameButLaterDate)
+
+            var replaceBitwiseReason = targetFileInfo.Exists
+                                    && sourceVersion.Equals(targetVersion)
+                                    && ReplaceBitwiseReason(sourceFilePath, targetFilePath);
+
+            if (!targetFileInfo.Exists || sourceVersion > targetVersion || versionsAreSameButLaterDate || replaceBitwiseReason)
             {
                 var targetDirectoryPath = Path.GetDirectoryName(targetFilePath);
                 Directory.CreateDirectory(targetDirectoryPath);
@@ -309,6 +315,65 @@ private void CopyFile(string sourceFilePath, string targetFilePath)
             }
         }
 
+        private bool ReplaceBitwiseReason(string sourceFilePath, string targetFilePath)
+        {
+            if (IsManagedLibrary(targetFilePath) || !sourceFilePath.EndsWith(".dll", StringComparison.InvariantCultureIgnoreCase))
+            {
+                return false;
+            }
+
+            var currentIs64 = Environment.Is64BitProcess;
+            var targetIs64 = !Is32Bitwise(targetFilePath);
+
+            if (currentIs64 == targetIs64)
+            {
+                return false;
+            }
+
+            var sourceIs64 = !Is32Bitwise(sourceFilePath);
+            if (currentIs64 == sourceIs64)
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        private bool IsManagedLibrary(string pathToDll)
+        {
+            try
+            {
+                AssemblyName.GetAssemblyName(pathToDll);
+                return true;
+            }
+            catch
+            {
+                // file is unmanaged
+            }
+
+            return false;
+        }
+
+        private bool Is32Bitwise(string dllPath)
+        {
+            try
+            {
+                using var fs = new FileStream(dllPath, FileMode.Open, FileAccess.Read);
+                using var br = new BinaryReader(fs);
+                fs.Seek(0x3c, SeekOrigin.Begin);
+                var peOffset = br.ReadInt32();
+
+                fs.Seek(peOffset, SeekOrigin.Begin);
+                var peHead = br.ReadUInt32();
+
+                return peHead == 0x00004550 && br.ReadUInt16() == 0x14c;
+            }
+            catch (EndOfStreamException exception)
+            {
+                throw new PlatformException($"Failed to read file '{dllPath}'.", exception);
+            }
+        }
+
         private bool IsAssemblyRelatedFile(string path)
         {
             return _options.AssemblyFileExtensions.Union(_options.AssemblyServiceFileExtensions).Any(x => path.EndsWith(x, StringComparison.OrdinalIgnoreCase));