recognize AnyCPU in case of fallback to PEReader

microsoft · Jan 28, 2022 · 31c8150 · 31c8150
1 parent 41ab9c0
commit 31c8150
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/src/vstest.console/CommandLine/AssemblyMetadataProvider.cs b/src/vstest.console/CommandLine/AssemblyMetadataProvider.cs
@@ -103,17 +103,28 @@ private Architecture GetArchitectureFromAssemblyMetadata(string path)
                 switch (peReader.PEHeaders.CoffHeader.Machine)
                 {
                     case Machine.Amd64:
-                        return Architecture.X64;
                     case Machine.IA64:
                         return Architecture.X64;
                     case Machine.Arm64:
                         return Architecture.ARM64;
                     case Machine.Arm:
                         return Architecture.ARM;
                     case Machine.I386:
-                        return Architecture.X86;
+                        // If requires 32bit or if R2R
+                        var corflags = peReader.PEHeaders.CorHeader.Flags;
+                        if ((corflags & CorFlags.Requires32Bit) != 0 || ((corflags & CorFlags.ILOnly) == 0))
+                        {
+                            return Architecture.X86;
+                        }
+                        else
+                        {
+                            return Architecture.AnyCPU;
+                        }
                     default:
-                        break;
+                        {
+                            EqtTrace.Error($"AssemblyMetadataProvider.GetArchitecture: Unhandled architecture '{peReader.PEHeaders.CoffHeader.Machine}'");
+                            break;
+                        }
                 }
             }