File tree 1 file changed +7
-2
lines changed
src/Microsoft.TestPlatform.PlatformAbstractions/common/System
1 file changed +7
-2
lines changed Original file line number Diff line number Diff line change @@ -179,8 +179,13 @@ public PlatformArchitecture GetCurrentProcessArchitecture()
179
179
/// <inheritdoc/>
180
180
public string GetNativeDllDirectory ( )
181
181
{
182
- var isArm = Environment . GetEnvironmentVariable ( "PROCESSOR_ARCHITECTURE" ) . Contains ( "ARM" ) ;
183
- return Path . Combine ( this . GetCurrentProcessLocation ( ) , this . GetCurrentProcessArchitecture ( ) . ToString ( ) , isArm ? ARM : string . Empty ) ;
182
+ var osArchitecture = new PlatformEnvironment ( ) . Architecture ;
183
+ if ( osArchitecture == PlatformArchitecture . ARM || osArchitecture == PlatformArchitecture . ARM64 )
184
+ {
185
+ return Path . Combine ( this . GetCurrentProcessLocation ( ) , this . GetCurrentProcessArchitecture ( ) . ToString ( ) . ToLower ( ) , ARM ) ;
186
+ }
187
+
188
+ return Path . Combine ( this . GetCurrentProcessLocation ( ) , this . GetCurrentProcessArchitecture ( ) . ToString ( ) . ToLower ( ) ) ;
184
189
}
185
190
}
186
191
}
You can’t perform that action at this time.
0 commit comments