Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Get OSArchitecture from Platform Abstraction to check for ARM Processor #1242

Merged
merged 2 commits into from
Oct 30, 2017
Merged

Get OSArchitecture from Platform Abstraction to check for ARM Processor #1242

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd08248
GetOsArchitecture from Platform Abstraction to check for ARM
Oct 30, 2017
c2a45fe
making sure path is always small
Oct 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/Microsoft.TestPlatform.PlatformAbstractions/common/System/ProcessHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,13 @@ public PlatformArchitecture GetCurrentProcessArchitecture()
/// <inheritdoc/>
public string GetNativeDllDirectory()
{
var isArm = Environment.GetEnvironmentVariable("PROCESSOR_ARCHITECTURE").Contains("ARM");
return Path.Combine(this.GetCurrentProcessLocation(), this.GetCurrentProcessArchitecture().ToString(), isArm ? ARM : string.Empty);
var osArchitecture = new PlatformEnvironment().Architecture;
if (osArchitecture == PlatformArchitecture.ARM || osArchitecture == PlatformArchitecture.ARM64)
{
return Path.Combine(this.GetCurrentProcessLocation(), this.GetCurrentProcessArchitecture().ToString(), ARM);
}

return Path.Combine(this.GetCurrentProcessLocation(), this.GetCurrentProcessArchitecture().ToString());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Case insensitive?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

path is case insensitive

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is not on xplat.

}
}
}