diff --git a/src/Microsoft.TestPlatform.ObjectModel/Utilities/AssemblyLoadWorker.cs b/src/Microsoft.TestPlatform.ObjectModel/Utilities/AssemblyLoadWorker.cs index aefba93a27..4992e32033 100644 --- a/src/Microsoft.TestPlatform.ObjectModel/Utilities/AssemblyLoadWorker.cs +++ b/src/Microsoft.TestPlatform.ObjectModel/Utilities/AssemblyLoadWorker.cs @@ -267,6 +267,7 @@ private static string GetArchitectureForSource(string imagePath) const int imageFileMachineArm = 0x01c0; // ARM Little-Endian const int imageFileMachineThumb = 0x01c2; // ARM Thumb/Thumb-2 Little-Endian const int imageFileMachineArmnt = 0x01c4; // ARM Thumb-2 Little-Endian + const int imageFileMachineArm64 = 0xAA64; // ARM64 Little-Endian try { @@ -333,6 +334,10 @@ private static string GetArchitectureForSource(string imagePath) case imageFileMachineArmnt: archType = "ARM"; break; + + case imageFileMachineArm64: + archType = "ARM64"; + break; } } else diff --git a/src/vstest.console/CommandLine/AssemblyMetadataProvider.cs b/src/vstest.console/CommandLine/AssemblyMetadataProvider.cs index 8a1e47df5f..816855d099 100644 --- a/src/vstest.console/CommandLine/AssemblyMetadataProvider.cs +++ b/src/vstest.console/CommandLine/AssemblyMetadataProvider.cs @@ -209,6 +209,7 @@ public Architecture GetArchitectureForSource(string imagePath) const int imageFileMachineArm = 0x01c0; // ARM Little-Endian const int imageFileMachineThumb = 0x01c2; // ARM Thumb/Thumb-2 Little-Endian const int imageFileMachineArmnt = 0x01c4; // ARM Thumb-2 Little-Endian + const int imageFileMachineArm64 = 0xAA64; // ARM64 Little-Endian try { @@ -276,6 +277,10 @@ public Architecture GetArchitectureForSource(string imagePath) case imageFileMachineArmnt: archType = Architecture.ARM; break; + + case imageFileMachineArm64: + archType = Architecture.ARM64; + break; } } else