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

Moving away from msdia managed wrapper, to doing P/Invoke on msdia. #1018

Merged
merged 9 commits into from
Aug 28, 2017
Merged

Moving away from msdia managed wrapper, to doing P/Invoke on msdia. #1018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5934078
Moving away from msdia managed wrapper, to doing P/Invoke on msdia.
mayankbansal018 Aug 23, 2017
bf2ba9c
Test + Code fixes
mayankbansal018 Aug 26, 2017
3ef9f93
Merge branch 'master' into pinvokedia
mayankbansal018 Aug 26, 2017
5c70a27
build fix
mayankbansal018 Aug 26, 2017
477179d
build failure fix
mayankbansal018 Aug 28, 2017
48b9c25
Process path is useless in netcore, we need testhost.dll path
mayankbansal018 Aug 28, 2017
7896c5d
PR comments
mayankbansal018 Aug 28, 2017
e1b333d
PR Comments
mayankbansal018 Aug 28, 2017
3e69adc
push dia to vsix
mayankbansal018 Aug 28, 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
14 changes: 13 additions & 1 deletion scripts/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ function Publish-Package
$fullCLRPackageDir = Get-FullCLRPackageDirectory
$coreCLRPackageDir = Get-CoreCLRPackageDirectory
$coreCLR20PackageDir = Get-CoreCLR20PackageDirectory
$coreCLR20TestHostPackageDir = Get-CoreCLR20TestHostPackageDirectory
$packageProject = Join-Path $env:TP_PACKAGE_PROJ_DIR "package\package.csproj"
$testHostProject = Join-Path $env:TP_ROOT_DIR "src\testhost\testhost.csproj"
$testHostx86Project = Join-Path $env:TP_ROOT_DIR "src\testhost.x86\testhost.x86.csproj"
Expand Down Expand Up @@ -254,6 +255,12 @@ function Publish-Package
Copy-Item $platformAbstractionNetFull\* $fullCLRPackageDir -Force
Copy-Item $platformAbstractionNetCore\* $coreCLR20PackageDir -Force

# Publish msdia
$comComponentsDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.Dia\14.0.0\contentFiles\any\any\ComComponents"
Copy-Item -Recurse $comComponentsDirectory\* $testhostCorePackageDir -Force
Copy-Item -Recurse $comComponentsDirectory\* $testhostFullPackageDir -Force
Copy-Item -Recurse $comComponentsDirectory\* $coreCLR20TestHostPackageDir -Force

# Copy over the logger assemblies to the Extensions folder.
$extensions_Dir = "Extensions"
$fullCLRExtensionsDir = Join-Path $fullCLRPackageDir $extensions_Dir
Expand Down Expand Up @@ -329,7 +336,7 @@ function Create-VsixPackage
Copy-Item -Recurse $legacyDir\* $packageDir -Force

# Copy COM Components and their manifests over
$comComponentsDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.Dia\14.0.0\contentFiles\any\any"
$comComponentsDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.Dia\14.0.0\contentFiles\any\any\ComComponents"
Copy-Item -Recurse $comComponentsDirectory\* $testhostPackageDir -Force

$fileToCopy = Join-Path $env:TP_PACKAGE_PROJ_DIR "ThirdPartyNotices.txt"
Expand Down Expand Up @@ -467,6 +474,11 @@ function Get-CoreCLR20PackageDirectory
return $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\$TPB_TargetFrameworkCore20")
}

function Get-CoreCLR20TestHostPackageDirectory
{
return $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\$TPB_TargetFrameworkCore20\TestHost")
}

function Start-Timer
{
return [System.Diagnostics.Stopwatch]::StartNew()
Expand Down
3 changes: 0 additions & 3 deletions src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@
<EmbeddedResource Include="Resources\Resources.resx;Resources\CommonResources.resx" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<PackageReference Include="Microsoft.Internal.Dia.Interop">
<Version>14.0.0</Version>
</PackageReference>
<Reference Include="System.Xml" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Runtime" />
Expand Down
5 changes: 0 additions & 5 deletions src/Microsoft.TestPlatform.ObjectModel/Navigation/DiaSession.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ public INavigationData GetNavigationDataForMethod(string declaringTypeName, stri

private static ISymbolReader GetSymbolReader(string binaryPath)
{
#if NET451
var pdbFilePath = Path.ChangeExtension(binaryPath, ".pdb");
using (var stream = new FileHelper().GetStream(pdbFilePath, FileMode.Open, FileAccess.Read))
{
Expand All @@ -105,10 +104,6 @@ private static ISymbolReader GetSymbolReader(string binaryPath)

return new FullSymbolReader();
}
#else
// We don't support full PDB files with .net core
return new PortableSymbolReader();
#endif
}
}
}
Loading