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

Jump to bottom

DSR.PortablePdb.Tests: Remove dependency on PdbUtilities #11026

Merged
merged 1 commit into from
May 3, 2016
Merged

DSR.PortablePdb.Tests: Remove dependency on PdbUtilities #11026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 0 additions & 7 deletions ...rosoft.DiaSymReader.PortablePdb.Tests/Microsoft.DiaSymReader.PortablePdb.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@
<Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
<Name>xUnit.net</Name>
</ProjectReference>
<ProjectReference Include="..\..\Test\PdbUtilities\PdbUtilities.csproj">
<Project>{afde6bea-5038-4a4a-a88e-dbd2e4088eed}</Project>
<Name>PdbUtilities</Name>
</ProjectReference>
<ProjectReference Include="..\Microsoft.DiaSymReader.PortablePdb\Microsoft.DiaSymReader.PortablePdb.csproj">
<Project>{f83343ba-b4ea-451c-b6db-5d645e6171bc}</Project>
<Name>Microsoft.DiaSymReader.PortablePdb</Name>
Expand Down Expand Up @@ -93,9 +89,6 @@
<Compile Include="SymBinderTests.cs" />
<Compile Include="TestHelpers\SymTestHelpers.cs" />
<Compile Include="TestResources.cs" />
<Compile Include="..\..\Compilers\Core\Portable\InternalUtilities\StreamExtensions.cs">
<Link>TestHelpers\StreamExtensions.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<Compile Include="TestHelpers\AssertEx.cs" />
Expand Down
53 changes: 50 additions & 3 deletions src/Debugging/Microsoft.DiaSymReader.PortablePdb.Tests/TestHelpers/SymTestHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,68 @@

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Reflection.Metadata;
using Roslyn.Test.PdbUtilities;
using System.Runtime.InteropServices;
using Roslyn.Test.Utilities;
using Xunit;

namespace Microsoft.DiaSymReader.PortablePdb.UnitTests
{
internal static class SymTestHelpers
{
[DefaultDllImportSearchPaths(DllImportSearchPath.AssemblyDirectory)]
[DllImport("Microsoft.DiaSymReader.Native.x86.dll", EntryPoint = "CreateSymReader")]
private extern static void CreateSymReader32(ref Guid id, [MarshalAs(UnmanagedType.IUnknown)]out object symReader);

[DefaultDllImportSearchPaths(DllImportSearchPath.AssemblyDirectory)]
[DllImport("Microsoft.DiaSymReader.Native.amd64.dll", EntryPoint = "CreateSymReader")]
private extern static void CreateSymReader64(ref Guid id, [MarshalAs(UnmanagedType.IUnknown)]out object symReader);

private static ISymUnmanagedReader3 CreateNativeSymReader(Stream pdbStream, object metadataImporter)
{
object symReader = null;

var guid = default(Guid);
if (IntPtr.Size == 4)
{
CreateSymReader32(ref guid, out symReader);
}
else
{
CreateSymReader64(ref guid, out symReader);
}

var reader = (ISymUnmanagedReader3)symReader;
reader.Initialize(pdbStream, metadataImporter);
return reader;
}

private static ISymUnmanagedReader3 CreatePortableSymReader(Stream pdbStream, object metadataImporter)
{
return (ISymUnmanagedReader3)new SymBinder().GetReaderFromStream(pdbStream, metadataImporter);
}

public static ISymUnmanagedReader3 CreateReader(Stream pdbStream, object metadataImporter)
{
pdbStream.Position = 0;
bool isPortable = pdbStream.ReadByte() == 'B' && pdbStream.ReadByte() == 'S' && pdbStream.ReadByte() == 'J' && pdbStream.ReadByte() == 'B';
pdbStream.Position = 0;

if (isPortable)
{
return CreatePortableSymReader(pdbStream, metadataImporter);
}
else
{
return CreateNativeSymReader(pdbStream, metadataImporter);
}
}

public static ISymUnmanagedReader CreateSymReaderFromResource(KeyValuePair<byte[], byte[]> peAndPdb)
{
return SymReaderFactory.CreateReaderImpl(new MemoryStream(peAndPdb.Value), metadataImporter: new SymMetadataImport(new MemoryStream(peAndPdb.Key)));
return CreateReader(new MemoryStream(peAndPdb.Value), metadataImporter: new SymMetadataImport(new MemoryStream(peAndPdb.Key)));
}

public static void ValidateDocumentUrl(ISymUnmanagedDocument document, string url)
Expand Down