From 3ba26044edff73f2ed782c7a0061712c5b42d2a4 Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Wed, 31 Mar 2021 16:06:38 -0700 Subject: [PATCH 1/8] attempt to update test platform ref --- GoogleTestAdapter/TestAdapter/TestAdapter.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GoogleTestAdapter/TestAdapter/TestAdapter.csproj b/GoogleTestAdapter/TestAdapter/TestAdapter.csproj index e4e2769e7..068748d77 100644 --- a/GoogleTestAdapter/TestAdapter/TestAdapter.csproj +++ b/GoogleTestAdapter/TestAdapter/TestAdapter.csproj @@ -140,8 +140,8 @@ $(NuGetPackages)Microsoft.TestPlatform.ObjectModel.11.0.0\lib\net35\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll False - - $(NuGetPackages)Microsoft.TestPlatform.ObjectModel.15.0.0\lib\net46\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll + + $(NuGetPackages)Microsoft.TestPlatform.ObjectModel.16.10.0-release-20210330-02\lib\net46\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll False From 859e8442e335214bbaa7b4096e891f5b2e40396b Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Thu, 1 Apr 2021 10:48:25 -0700 Subject: [PATCH 2/8] update TestPlatform.ObjectModel reference --- .../TestAdapter.Tests/TestAdapter.Tests.csproj | 8 ++++---- GoogleTestAdapter/TestAdapter.Tests/packages.config.tt | 2 +- GoogleTestAdapter/TestAdapter/TestAdapter.csproj | 6 +++--- GoogleTestAdapter/TestAdapter/packages.config.tt | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/GoogleTestAdapter/TestAdapter.Tests/TestAdapter.Tests.csproj b/GoogleTestAdapter/TestAdapter.Tests/TestAdapter.Tests.csproj index efb29a6f6..8b7e6bd36 100644 --- a/GoogleTestAdapter/TestAdapter.Tests/TestAdapter.Tests.csproj +++ b/GoogleTestAdapter/TestAdapter.Tests/TestAdapter.Tests.csproj @@ -52,15 +52,15 @@ $(NuGetPackages)FluentAssertions.4.19.0\lib\net45\FluentAssertions.Core.dll True - - $(NuGetPackages)Microsoft.TestPlatform.ObjectModel.15.0.0\lib\net46\Microsoft.TestPlatform.CoreUtilities.dll + + $(NuGetPackages)Microsoft.TestPlatform.ObjectModel.16.10.0-release-20210330-02\lib\net45\Microsoft.TestPlatform.CoreUtilities.dll $(NuGetPackages)Microsoft.TestPlatform.ObjectModel.11.0.0\lib\net35\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll True - - $(NuGetPackages)Microsoft.TestPlatform.ObjectModel.15.0.0\lib\net46\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll + + $(NuGetPackages)Microsoft.TestPlatform.ObjectModel.16.10.0-release-20210330-02\lib\net45\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll True diff --git a/GoogleTestAdapter/TestAdapter.Tests/packages.config.tt b/GoogleTestAdapter/TestAdapter.Tests/packages.config.tt index 821f7c294..c62074d10 100644 --- a/GoogleTestAdapter/TestAdapter.Tests/packages.config.tt +++ b/GoogleTestAdapter/TestAdapter.Tests/packages.config.tt @@ -9,7 +9,7 @@ <# if (TestAdapterFlavor == "GTA") { #> <# } else if (TestAdapterFlavor == "TAfGT") { #> - + <# } #> diff --git a/GoogleTestAdapter/TestAdapter/TestAdapter.csproj b/GoogleTestAdapter/TestAdapter/TestAdapter.csproj index 068748d77..a6bbefdab 100644 --- a/GoogleTestAdapter/TestAdapter/TestAdapter.csproj +++ b/GoogleTestAdapter/TestAdapter/TestAdapter.csproj @@ -133,15 +133,15 @@ True False - - $(NuGetPackages)Microsoft.TestPlatform.ObjectModel.15.0.0\lib\net46\Microsoft.TestPlatform.CoreUtilities.dll + + $(NuGetPackages)Microsoft.TestPlatform.ObjectModel.16.10.0-release-20210330-02\lib\net45\Microsoft.TestPlatform.CoreUtilities.dll $(NuGetPackages)Microsoft.TestPlatform.ObjectModel.11.0.0\lib\net35\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll False - $(NuGetPackages)Microsoft.TestPlatform.ObjectModel.16.10.0-release-20210330-02\lib\net46\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll + $(NuGetPackages)Microsoft.TestPlatform.ObjectModel.16.10.0-release-20210330-02\lib\net45\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll False diff --git a/GoogleTestAdapter/TestAdapter/packages.config.tt b/GoogleTestAdapter/TestAdapter/packages.config.tt index b42060716..6778031ab 100644 --- a/GoogleTestAdapter/TestAdapter/packages.config.tt +++ b/GoogleTestAdapter/TestAdapter/packages.config.tt @@ -29,6 +29,6 @@ <# } else if (TestAdapterFlavor == "TAfGT") { #> - + <# } #> From 82564798f9a87ce35f8fac8c7af6a6bfd54a97c5 Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Thu, 1 Apr 2021 11:58:11 -0700 Subject: [PATCH 3/8] fix build by not trying to deploy --- GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj b/GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj index 07ddc7c66..945072566 100644 --- a/GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj +++ b/GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj @@ -25,7 +25,7 @@ true true true - false + false true From dccd0448f8d561464d349d72fa4ac8fa2a4e37f4 Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Thu, 1 Apr 2021 13:46:23 -0700 Subject: [PATCH 4/8] implement ITestExecutor2 to not attach to testhost.exe --- GoogleTestAdapter/TestAdapter/TestExecutor.cs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/GoogleTestAdapter/TestAdapter/TestExecutor.cs b/GoogleTestAdapter/TestAdapter/TestExecutor.cs index c93540ca3..5e870c818 100644 --- a/GoogleTestAdapter/TestAdapter/TestExecutor.cs +++ b/GoogleTestAdapter/TestAdapter/TestExecutor.cs @@ -15,12 +15,13 @@ using GoogleTestAdapter.Model; using GoogleTestAdapter.TestAdapter.Helpers; using GoogleTestAdapter.TestAdapter.Framework; +using Microsoft.VisualStudio.TestPlatform.ObjectModel; namespace GoogleTestAdapter.TestAdapter { [ExtensionUri(ExecutorUriString)] - public partial class TestExecutor : ITestExecutor + public partial class TestExecutor : ITestExecutor2 { public static readonly Uri ExecutorUri = new Uri(ExecutorUriString); @@ -234,6 +235,17 @@ private void DoRunTests(ICollection testCasesToRun, IRunContext runCon reporter.AllTestsFinished(); } + public bool ShouldAttachToTestHost(IEnumerable sources, IRunContext runContext) + { + // TODO: expose setting in runContext to attach to testhost if needed? + return false; + } + + public bool ShouldAttachToTestHost(IEnumerable tests, IRunContext runContext) + { + // TODO: expose setting in runContext to attach to testhost if needed? + return false; + } } } \ No newline at end of file From d9fca3d4d60ecd985c722ae82b960f75f3d190fc Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Thu, 1 Apr 2021 15:00:42 -0700 Subject: [PATCH 5/8] remove using that wasnt needed --- GoogleTestAdapter/TestAdapter/TestExecutor.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/GoogleTestAdapter/TestAdapter/TestExecutor.cs b/GoogleTestAdapter/TestAdapter/TestExecutor.cs index 5e870c818..a14e7e495 100644 --- a/GoogleTestAdapter/TestAdapter/TestExecutor.cs +++ b/GoogleTestAdapter/TestAdapter/TestExecutor.cs @@ -15,7 +15,6 @@ using GoogleTestAdapter.Model; using GoogleTestAdapter.TestAdapter.Helpers; using GoogleTestAdapter.TestAdapter.Framework; -using Microsoft.VisualStudio.TestPlatform.ObjectModel; namespace GoogleTestAdapter.TestAdapter { From 921b04004ba276bdfba7050f76116c26bac3cec6 Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Fri, 2 Apr 2021 16:12:46 -0700 Subject: [PATCH 6/8] add back testwindow references --- GoogleTestAdapter/TestAdapter/TestAdapter.csproj | 8 ++++++++ GoogleTestAdapter/TestAdapter/packages.config.tt | 2 ++ 2 files changed, 10 insertions(+) diff --git a/GoogleTestAdapter/TestAdapter/TestAdapter.csproj b/GoogleTestAdapter/TestAdapter/TestAdapter.csproj index a6bbefdab..322dfc562 100644 --- a/GoogleTestAdapter/TestAdapter/TestAdapter.csproj +++ b/GoogleTestAdapter/TestAdapter/TestAdapter.csproj @@ -143,6 +143,14 @@ $(NuGetPackages)Microsoft.TestPlatform.ObjectModel.16.10.0-release-20210330-02\lib\net45\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll False + + + $(NuGetPackages)Microsoft.VisualStudio.TestWindow.Interfaces.11.0.61030\lib\net45\Microsoft.VisualStudio.TestWindow.Interfaces.dll + False + + + $(NuGetPackages)Microsoft.VisualStudio.TestWindow.Interfaces.11.0.61030\lib\net45\Microsoft.VisualStudio.TestWindow.Interfaces.dll + False $(NuGetPackages)VSSDK.TextManager.Interop.7.0.4\lib\net20\Microsoft.VisualStudio.TextManager.Interop.dll diff --git a/GoogleTestAdapter/TestAdapter/packages.config.tt b/GoogleTestAdapter/TestAdapter/packages.config.tt index 6778031ab..0010d3826 100644 --- a/GoogleTestAdapter/TestAdapter/packages.config.tt +++ b/GoogleTestAdapter/TestAdapter/packages.config.tt @@ -28,7 +28,9 @@ + <# } else if (TestAdapterFlavor == "TAfGT") { #> + <# } #> From 6d274ba45c649cf0574ea11e0e35c0144eb8d2af Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Fri, 2 Apr 2021 17:46:48 -0700 Subject: [PATCH 7/8] Revert "add back testwindow references" This reverts commit 921b04004ba276bdfba7050f76116c26bac3cec6. --- GoogleTestAdapter/TestAdapter/TestAdapter.csproj | 8 -------- GoogleTestAdapter/TestAdapter/packages.config.tt | 2 -- 2 files changed, 10 deletions(-) diff --git a/GoogleTestAdapter/TestAdapter/TestAdapter.csproj b/GoogleTestAdapter/TestAdapter/TestAdapter.csproj index 322dfc562..a6bbefdab 100644 --- a/GoogleTestAdapter/TestAdapter/TestAdapter.csproj +++ b/GoogleTestAdapter/TestAdapter/TestAdapter.csproj @@ -143,14 +143,6 @@ $(NuGetPackages)Microsoft.TestPlatform.ObjectModel.16.10.0-release-20210330-02\lib\net45\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll False - - - $(NuGetPackages)Microsoft.VisualStudio.TestWindow.Interfaces.11.0.61030\lib\net45\Microsoft.VisualStudio.TestWindow.Interfaces.dll - False - - - $(NuGetPackages)Microsoft.VisualStudio.TestWindow.Interfaces.11.0.61030\lib\net45\Microsoft.VisualStudio.TestWindow.Interfaces.dll - False $(NuGetPackages)VSSDK.TextManager.Interop.7.0.4\lib\net20\Microsoft.VisualStudio.TextManager.Interop.dll diff --git a/GoogleTestAdapter/TestAdapter/packages.config.tt b/GoogleTestAdapter/TestAdapter/packages.config.tt index 0010d3826..6778031ab 100644 --- a/GoogleTestAdapter/TestAdapter/packages.config.tt +++ b/GoogleTestAdapter/TestAdapter/packages.config.tt @@ -28,9 +28,7 @@ - <# } else if (TestAdapterFlavor == "TAfGT") { #> - <# } #> From 8102be64d06025ee9ae1fbfd17c6c48504c5398b Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Fri, 2 Apr 2021 17:50:08 -0700 Subject: [PATCH 8/8] add vspackage as mef component to vsixmanifest since we moved one of the testwindow exports there --- GoogleTestAdapter/Packaging.TAfGT/source.extension.vsixmanifest | 1 + 1 file changed, 1 insertion(+) diff --git a/GoogleTestAdapter/Packaging.TAfGT/source.extension.vsixmanifest b/GoogleTestAdapter/Packaging.TAfGT/source.extension.vsixmanifest index d3ba192ad..266e6a3a7 100644 --- a/GoogleTestAdapter/Packaging.TAfGT/source.extension.vsixmanifest +++ b/GoogleTestAdapter/Packaging.TAfGT/source.extension.vsixmanifest @@ -33,6 +33,7 @@ +