Understanding assembly type from source by abhishkk · Pull Request #1529 · microsoft/vstest

abhishkk · 2018-04-05T14:57:47Z

Part 2 of RFC:
Contains changes for understanding assembly type from sources.

smadala · 2018-04-05T15:32:25Z

src/Microsoft.TestPlatform.Common/Utilities/PEReaderHelper.cs

+
+            try
+            {
+                using (var assemblyStream = File.Open(filePath, FileMode.Open, FileAccess.Read))


Use FileHelper interface.

Use FileShare.

done. Added API in FileHelper also.

smadala · 2018-04-05T15:34:02Z

TestPlatform.sln

 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "vstest.console.PlatformTests", "test\vstest.console.PlatformTests\vstest.console.PlatformTests.csproj", "{8C068694-23A2-47A2-A0DD-DB82D0AF0142}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleManagedApp", "test\TestAssets\ConsoleManagedApp\ConsoleManagedApp.csproj", "{A4AAB1DF-BAD4-4C75-A0FD-10EDC2F38106}"


Add to TestAssets.sln

smadala · 2018-04-05T15:38:55Z

test/Microsoft.TestPlatform.Common.UnitTests/Utilities/PEReaderHelperTests.cs

+    using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+    [TestClass]
+    public class PEReaderHelperTests : IntegrationTestBase


Move this to common platform tests.

smadala · 2018-04-05T15:39:50Z

test/TestAssets/CPPSimpleTestProject/CPPSimpleProj/CPPSimpleProj.vcxproj

+    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
    <ProjectName>Microsoft.TestPlatform.TestAsset.NativeCPP</ProjectName>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />


Why ConsoleNativeApp.cpp is binary file?

smadala · 2018-04-05T15:40:30Z

test/TestAssets/CPPSimpleTestProject/ConsoleNativeApp/ConsoleNativeApp.vcxproj.filters

+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>


Below files should not be binary files.

smadala · 2018-04-05T15:43:03Z

src/Microsoft.TestPlatform.Common/Utilities/PEReaderHelper.cs

+                {
+                    var peHeaders = peReader.PEHeaders;
+                    var corHeader = peHeaders.CorHeader;
+                    var corHeaderStartOffset = peHeaders.CorHeaderStartOffset;


Add link to documentation in comment.

mayankbansal018 · 2018-04-05T15:58:52Z

src/Microsoft.TestPlatform.Common/Utilities/PEReaderHelper.cs

+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Microsoft.VisualStudio.TestPlatform.Common.Utilities


Why is this class Singleton?

Not required. Removed.

mayankbansal018

smadala · 2018-04-09T06:07:46Z

src/Microsoft.TestPlatform.Common/Utilities/PEReaderHelper.cs

+        /// Initializes a new instance of the <see cref="PEReaderHelper"/> class.
+        /// </summary>
+        /// <param name="fileHelper">File helper.</param>
+        public PEReaderHelper(FileHelper fileHelper)


Use type IFileHelper.

smadala · 2018-04-09T06:42:56Z

src/Microsoft.TestPlatform.Common/Utilities/PEReaderHelper.cs

+
+            try
+            {
+                using (var fileStream = fileHelper.GetStream(filePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))


Nit: Add this.

smadala · 2018-04-09T06:43:42Z

src/Microsoft.TestPlatform.Common/Utilities/PEReaderHelper.cs

+            }
+            catch (Exception ex)
+            {
+                EqtTrace.Warning("GetAssemblyTypeFromAssemblyMetadata: failed to determine assembly type: {0} for assembly: {1}", ex, filePath);


Nit: Keep message prefix to Classname.Method name.

smadala · 2018-04-09T06:44:30Z

src/Microsoft.TestPlatform.Common/Utilities/PEReaderHelper.cs

+
+            if (EqtTrace.IsInfoEnabled)
+            {
+                EqtTrace.Info("AssemblyMetadataProvider.GetAssemblyType: Determined assemblyType:'{0}' for source: '{1}'", assemblyType, filePath);


Nit: change the class name.

smadala · 2018-04-09T06:45:46Z

...crosoft.TestPlatform.Common.PlatformTests/Microsoft.TestPlatform.Common.PlatformTests.csproj

+  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp1.0;net451</TargetFrameworks>
+	<OutputType Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">Exe</OutputType>


Nit: this line is not required.

smadala · 2018-04-09T06:51:04Z

...crosoft.TestPlatform.Common.PlatformTests/Microsoft.TestPlatform.Common.PlatformTests.csproj

+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.TestPlatform.TestUtilities\Microsoft.TestPlatform.TestUtilities.csproj" />
+    <PackageReference Include="Microsoft.TestPlatform.TestAsset.NativeCPP">
+      <Version>2.0.0</Version>


Please never upload nupkg with same version after changing the content. It will leads to different behavior based on user nuget cache.

Not doing in this as we are only using it this nuget. Will update if happens in future changes

acesiddhu · 2018-04-09T10:15:47Z

src/Microsoft.TestPlatform.Common/Utilities/PEReaderHelper.cs

+
+            try
+            {
+                using (var fileStream = this.fileHelper.GetStream(filePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))


why ReadWrite

Its share permission for other threads

acesiddhu · 2018-04-09T10:21:19Z

src/Microsoft.TestPlatform.Common/Utilities/PEReaderHelper.cs

+
+            if (EqtTrace.IsInfoEnabled)
+            {
+                EqtTrace.Info("PEReaderHelper.GetAssemblyType: Determined assemblyType:'{0}' for source: '{1}'", assemblyType, filePath);


this should go in resources

these are logs only.

acesiddhu · 2018-04-09T10:23:03Z

src/Microsoft.TestPlatform.Common/Utilities/PEReaderHelper.cs

+                    var corHeader = peHeaders.CorHeader;
+                    var corHeaderStartOffset = peHeaders.CorHeaderStartOffset;
+
+                    assemblyType = (corHeader != null && corHeaderStartOffset >= 0) ?


can you point the documentation for how to determine if the assembly is managed or native

Documentation links added in above lines

Understanding assembly type from source

d3c3315

abhishkk requested review from acesiddhu, cltshivash, mayankbansal018, singhsarab and smadala April 5, 2018 14:57

smadala suggested changes Apr 5, 2018

View reviewed changes

mayankbansal018 reviewed Apr 5, 2018

View reviewed changes

review comments

7111cc3

mayankbansal018 approved these changes Apr 6, 2018

View reviewed changes

smadala reviewed Apr 9, 2018

View reviewed changes

smadala approved these changes Apr 9, 2018

View reviewed changes

abhishkk added 2 commits April 9, 2018 12:54

Merge branch 'master' into understandingAssemblyTypeFromSources

19997cd

review comments

ce10941

abhishkk merged commit 534026f into microsoft:master Apr 9, 2018

acesiddhu reviewed Apr 9, 2018

View reviewed changes

Conversation

abhishkk commented Apr 5, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mayankbansal018 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants