Skip to content

Fix debugging from test explorer & don't attach to testhost.exe #190

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

Merged
spebl merged 8 commits into from
Apr 6, 2021
Merged

Fix debugging from test explorer & don't attach to testhost.exe #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3ba2604
attempt to update test platform ref
spebl Mar 31, 2021
859e844
update TestPlatform.ObjectModel reference
spebl Apr 1, 2021
8256479
fix build by not trying to deploy
spebl Apr 1, 2021
dccd044
implement ITestExecutor2 to not attach to testhost.exe
spebl Apr 1, 2021
d9fca3d
remove using that wasnt needed
spebl Apr 1, 2021
921b040
add back testwindow references
spebl Apr 2, 2021
6d274ba
Revert "add back testwindow references"
spebl Apr 3, 2021
8102be6
add vspackage as mef component to vsixmanifest since we moved one of …
spebl Apr 3, 2021
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
2 changes: 1 addition & 1 deletion GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<CopyBuildOutputToOutputDirectory>true</CopyBuildOutputToOutputDirectory>
<CopyOutputSymbolsToOutputDirectory>true</CopyOutputSymbolsToOutputDirectory>
<BypassVsixValidation>true</BypassVsixValidation>
<DeployExtension Condition="'$(TestAdapterFlavor)' != 'TAfGT'">false</DeployExtension>
<DeployExtension>false</DeployExtension>
<IsProductComponent Condition="'$(ProductComponent)' == 'true'">true</IsProductComponent>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Expand Down
1 change: 1 addition & 0 deletions GoogleTestAdapter/Packaging.TAfGT/source.extension.vsixmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
<Asset Type="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1.3.nupkg" d:Source="File" Path="Packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1.3.nupkg" d:VsixSubPath="Packages" />
<Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="GoogleTestProjectTemplate" d:TargetPath="|GoogleTestProjectTemplate;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
<Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" d:ProjectName="GoogleTestItemTemplate" d:TargetPath="|GoogleTestItemTemplate;TemplateProjectOutputGroup|" Path="ItemTemplates" d:VsixSubPath="ItemTemplates" />
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="VsPackage.TAfGT" Path="|VsPackage.TAfGT|" />
</Assets>
<Prerequisites>
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.8.27729.1,17.0)" DisplayName="Visual Studio core editor" />
Expand Down
8 changes: 4 additions & 4 deletions GoogleTestAdapter/TestAdapter.Tests/TestAdapter.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@
<HintPath>$(NuGetPackages)FluentAssertions.4.19.0\lib\net45\FluentAssertions.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.TestPlatform.CoreUtilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" Condition="'$(TestAdapterFlavor)' == 'TAfGT'">
<HintPath>$(NuGetPackages)Microsoft.TestPlatform.ObjectModel.15.0.0\lib\net46\Microsoft.TestPlatform.CoreUtilities.dll</HintPath>
<Reference Include="Microsoft.TestPlatform.CoreUtilities, Version=16.10.0-release-20210330-02, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" Condition="'$(TestAdapterFlavor)' == 'TAfGT'">
<HintPath>$(NuGetPackages)Microsoft.TestPlatform.ObjectModel.16.10.0-release-20210330-02\lib\net45\Microsoft.TestPlatform.CoreUtilities.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestPlatform.ObjectModel, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" Condition="'$(TestAdapterFlavor)' == 'GTA'">
<HintPath>$(NuGetPackages)Microsoft.TestPlatform.ObjectModel.11.0.0\lib\net35\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestPlatform.ObjectModel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" Condition="'$(TestAdapterFlavor)' == 'TAfGT'">
<HintPath>$(NuGetPackages)Microsoft.TestPlatform.ObjectModel.15.0.0\lib\net46\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll</HintPath>
<Reference Include="Microsoft.VisualStudio.TestPlatform.ObjectModel, Version=16.10.0-release-20210330-02, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" Condition="'$(TestAdapterFlavor)' == 'TAfGT'">
<HintPath>$(NuGetPackages)Microsoft.TestPlatform.ObjectModel.16.10.0-release-20210330-02\lib\net45\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Moq, Version=4.5.30.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
Expand Down
2 changes: 1 addition & 1 deletion GoogleTestAdapter/TestAdapter.Tests/packages.config.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<# if (TestAdapterFlavor == "GTA") { #>
<package id="Microsoft.TestPlatform.ObjectModel" version="11.0.0" targetFramework="net452" />
<# } else if (TestAdapterFlavor == "TAfGT") { #>
<package id="Microsoft.TestPlatform.ObjectModel" version="15.0.0" targetFramework="net46" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.10.0-release-20210330-02" targetFramework="net46" />
<# } #>
<package id="OpenCover" version="4.7.922" targetFramework="net452" />
</packages>
8 changes: 4 additions & 4 deletions GoogleTestAdapter/TestAdapter/TestAdapter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,15 +133,15 @@
<Private>True</Private>
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.TestPlatform.CoreUtilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" Condition="'$(TestAdapterFlavor)' == 'TAfGT'">
<HintPath>$(NuGetPackages)Microsoft.TestPlatform.ObjectModel.15.0.0\lib\net46\Microsoft.TestPlatform.CoreUtilities.dll</HintPath>
<Reference Include="Microsoft.TestPlatform.CoreUtilities, Version=16.10.0-release-20210330-02, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" Condition="'$(TestAdapterFlavor)' == 'TAfGT'">
<HintPath>$(NuGetPackages)Microsoft.TestPlatform.ObjectModel.16.10.0-release-20210330-02\lib\net45\Microsoft.TestPlatform.CoreUtilities.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestPlatform.ObjectModel, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" Condition="'$(TestAdapterFlavor)' == 'GTA'">
<HintPath>$(NuGetPackages)Microsoft.TestPlatform.ObjectModel.11.0.0\lib\net35\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestPlatform.ObjectModel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" Condition="'$(TestAdapterFlavor)' == 'TAfGT'">
<HintPath>$(NuGetPackages)Microsoft.TestPlatform.ObjectModel.15.0.0\lib\net46\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll</HintPath>
<Reference Include="Microsoft.VisualStudio.TestPlatform.ObjectModel, Version=16.10.0-release-20210330-02, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" Condition="'$(TestAdapterFlavor)' == 'TAfGT'">
<HintPath>$(NuGetPackages)Microsoft.TestPlatform.ObjectModel.16.10.0-release-20210330-02\lib\net45\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
Expand Down
13 changes: 12 additions & 1 deletion GoogleTestAdapter/TestAdapter/TestExecutor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ namespace GoogleTestAdapter.TestAdapter
{

[ExtensionUri(ExecutorUriString)]
public partial class TestExecutor : ITestExecutor
public partial class TestExecutor : ITestExecutor2
{
public static readonly Uri ExecutorUri = new Uri(ExecutorUriString);

Expand Down Expand Up @@ -234,6 +234,17 @@ private void DoRunTests(ICollection<TestCase> testCasesToRun, IRunContext runCon
reporter.AllTestsFinished();
}

public bool ShouldAttachToTestHost(IEnumerable<string> sources, IRunContext runContext)
{
// TODO: expose setting in runContext to attach to testhost if needed?
return false;
}

public bool ShouldAttachToTestHost(IEnumerable<VsTestCase> tests, IRunContext runContext)
{
// TODO: expose setting in runContext to attach to testhost if needed?
return false;
}
}

}
2 changes: 1 addition & 1 deletion GoogleTestAdapter/TestAdapter/packages.config.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@
<package id="VSSDK.TextManager.Interop.8" version="8.0.4" targetFramework="net45" />
<package id="VSSDK.TextManager.Interop.9" version="9.0.4" targetFramework="net45" />
<# } else if (TestAdapterFlavor == "TAfGT") { #>
<package id="Microsoft.TestPlatform.ObjectModel" version="15.0.0" targetFramework="net46" />
<package id="Microsoft.TestPlatform.ObjectModel" version="16.10.0-release-20210330-02" targetFramework="net46" />
<# } #>
</packages>