-
Notifications
You must be signed in to change notification settings - Fork 331
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.
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
Fix to determine assembly PlatformTarget for AnyCpu assemblies #1210
Merged
Merged
Changes from 6 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
2b771fc
Fix to determine assembly PlatformTarget for AnyCpu assemblies
smadala c0f038f
Fix perf project dependency
smadala c467890
update test.ps1
smadala 6d5ee4d
Merge branch 'master' into arch-anycpu-fix
harshjain2 0867c9f
Set fail fast based on trx file
smadala 59395ad
Merge branch 'arch-anycpu-fix' of https://github.com/smadala/vstest i…
smadala b4a2c64
Update test for release config
smadala 505acc3
Remove AssemblyMetadataProviderPerfTests
smadala 411c853
Remove no required friend
smadala eb399bc
Fix nit
smadala e5468dc
Add seperate project from x86 and ARM platforms
smadala 3875b6d
Update acceptance tests
smadala bfa0dc2
Merge branch 'master' into arch-anycpu-fix
smadala File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -52,18 +52,24 @@ public Architecture GetArchitecture(string assemblyPath) | |
try | ||
{ | ||
// AssemblyName won't load the assembly into current domain. | ||
archType = MapToArchitecture(new AssemblyName(assemblyPath).ProcessorArchitecture); | ||
var assemblyName = AssemblyName.GetAssemblyName(assemblyPath); | ||
archType = MapToArchitecture(assemblyName.ProcessorArchitecture); | ||
} | ||
catch (Exception) | ||
catch (Exception ex) | ||
{ | ||
if (EqtTrace.IsVerboseEnabled) | ||
{ | ||
EqtTrace.Verbose("AssemblyMetadataProvider:GetArchitecture() Failed get ProcessorArchitecture using AssemblyName API with exception: {0}", ex); | ||
} | ||
|
||
// AssemblyName will thorw Exception if assembly contains native code or no manifest. | ||
try | ||
{ | ||
archType = GetArchitectureForSource(assemblyPath); | ||
} | ||
catch (Exception ex) | ||
catch (Exception e) | ||
{ | ||
EqtTrace.Error("Failed to determine Assembly Architecture: {0}", ex); | ||
EqtTrace.Info("Failed to determine Assembly Architecture with exception: {0}", e); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. EqtTrace.IsVerboseEnabled? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done. |
||
} | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit : AssemblyMetadataProvider.GetArchitecture() :
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done.