Merge pull request #1236 from nunit/vnext

Vnext => 5.0.0
nunit · Feb 5, 2025 · e6d58ff · e6d58ff
2 parents 25a1573 + fbc8582
commit e6d58ff
Show file tree

Hide file tree

Showing 21 changed files with 274 additions and 78 deletions.
diff --git a/.github/workflows/NUnit3TestAdapter.Myget.Publish.yml b/.github/workflows/NUnit3TestAdapter.Myget.Publish.yml
@@ -6,7 +6,7 @@ on:
       - main
       - master
       - release
-      - 'v3'
+      - vnext
       - myget
   workflow_dispatch:
 
@@ -27,9 +27,7 @@ jobs:
       with:
         dotnet-version: |
           3.1.x
-          5.0.x
           6.0.x
-          7.0.x
           8.0.x
            
     - name: Build  
@@ -46,6 +44,4 @@ jobs:
           foreach($file in (Get-ChildItem package -Recurse -Include *.nupkg)) {
               dotnet nuget push $file --api-key "${{ secrets.PUBLISHMYGET }}" --source https://www.myget.org/F/nunit/api/v3/index.json --skip-duplicate
           }
-          foreach($file in (Get-ChildItem "package" -Recurse -Include *.snupkg)) {
-              dotnet nuget push $file --api-key "${{ secrets.PUBLISHMYGET }}" --source https://www.myget.org/F/nunit/api/v3/index.json --skip-duplicate
-          } 
+
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -4,30 +4,27 @@
     <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
   </PropertyGroup>
   <ItemGroup>
-
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageVersion Include="NSubstitute" Version="5.3.0" />
-    <PackageVersion Include="nunit" Version="4.2.2" />
+    <PackageVersion Include="nunit" Version="4.3.2" />
     <PackageVersion Include="nunit.engine" Version="3.18.1" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
     <PackageVersion Include="SourceLink.Create.CommandLine" Version="2.8.3" />
-    <PackageVersion Include="TestCentric.Metadata" Version="3.0.2" />
-    <PackageVersion Include="Microsoft.TestPlatform.ObjectModel" Version="17.11.0" PrivateAssets="All"/>
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" >
+    <PackageVersion Include="TestCentric.Metadata" Version="3.0.3" />
+    <!--<PackageVersion Include="Microsoft.TestPlatform.ObjectModel" Version="17.11.0" PrivateAssets="All"/>-->
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageVersion>
     <PackageVersion Include="Castle.Core" Version="5.1.1" />
+    <PackageVersion Include="Microsoft.Testing.Extensions.VSTestBridge" Version="1.5.3" />
   </ItemGroup>
-
   <ItemGroup>
-    <GlobalPackageReference  Include="NUnit.Analyzers" Version="4.3.0" >
+    <GlobalPackageReference Include="NUnit.Analyzers" Version="4.6.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </GlobalPackageReference>
     <GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
-
     <GlobalPackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
   </ItemGroup>
-
-</Project>
+</Project>
diff --git a/NUnit3TestAdapter.sln b/NUnit3TestAdapter.sln
@@ -40,6 +40,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "net462", "net462", "{D41249E3-C080-4B66-8CBD-99CE4D309A10}"
 	ProjectSection(SolutionItems) = preProject
 		nuget\net462\NUnit3TestAdapter.props = nuget\net462\NUnit3TestAdapter.props
+		nuget\net462\NUnit3TestAdapter.targets = nuget\net462\NUnit3TestAdapter.targets
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUnit.TestAdapter.Tests.Acceptance", "src\NUnit.TestAdapter.Tests.Acceptance\NUnit.TestAdapter.Tests.Acceptance.csproj", "{3FAC7EE0-664F-4B11-918B-8E0FF865EE4C}"
@@ -60,6 +61,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "netcoreapp3.1", "netcoreapp3.1", "{2F940513-5B8F-45A5-A188-7C5D03D1B50D}"
 	ProjectSection(SolutionItems) = preProject
 		nuget\netcoreapp3.1\NUnit3TestAdapter.props = nuget\netcoreapp3.1\NUnit3TestAdapter.props
+		nuget\netcoreapp3.1\NUnit3TestAdapter.targets = nuget\netcoreapp3.1\NUnit3TestAdapter.targets
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "images", "images", "{3D1159FD-FC4D-4750-87EA-F477B3912B3C}"

diff --git a/build.cake b/build.cake
@@ -1,5 +1,5 @@
 #tool vswhere&version=3.1.7
-#tool Microsoft.TestPlatform&version=17.9.0
+#tool Microsoft.TestPlatform&version=17.12.0
 
 //////////////////////////////////////////////////////////////////////
 // ARGUMENTS
@@ -13,9 +13,9 @@ var configuration = Argument("configuration", "Release");
 //////////////////////////////////////////////////////////////////////
 
 
-var version = "4.6.0";
+var version = "5.0.0";
 
-var modifier = "";
+var modifier = "-beta.7";
 
 var dbgSuffix = configuration.ToLower() == "debug" ? "-dbg" : "";
 var packageVersion = version + modifier + dbgSuffix;
@@ -225,6 +225,7 @@ Task("CreateWorkingImage")
         CreateDirectory(net462Dir);
         CopyFiles(net462Files, net462Dir);
         CopyFileToDirectory("nuget/net462/NUnit3TestAdapter.props", net462Dir);
+        CopyFileToDirectory("nuget/net462/NUnit3TestAdapter.targets", net462Dir);
 
         var netcoreDir = PACKAGE_IMAGE_DIR + "build/" + NETCOREAPP_TFM;
         DotNetCorePublish(ADAPTER_PROJECT, new DotNetCorePublishSettings
@@ -234,6 +235,7 @@ Task("CreateWorkingImage")
             Framework = NETCOREAPP_TFM
         });
         CopyFileToDirectory($"nuget/{NETCOREAPP_TFM}/NUnit3TestAdapter.props", netcoreDir);
+        CopyFileToDirectory($"nuget/{NETCOREAPP_TFM}/NUnit3TestAdapter.targets", netcoreDir);
     });
 
 Task("PackageZip")

diff --git a/nuget.config b/nuget.config
@@ -3,6 +3,5 @@
   <packageSources>
     <clear />
     <add key="nuget" value="https://api.nuget.org/v3/index.json" />
-    <!--<add key="Local" value="c:\nuget" />-->
   </packageSources>
 </configuration>
diff --git a/nuget/NUnit3TestAdapter.nuspec b/nuget/NUnit3TestAdapter.nuspec
@@ -19,11 +19,22 @@
       For VS 2017 and forward, you should add this package to every test project in your solution. (Earlier versions only require a single adapter package per solution.)
     </description>
     <releaseNotes>See https://docs.nunit.org/articles/vs-test-adapter/Adapter-Release-Notes.html </releaseNotes>
-    <copyright>Copyright (c) 2011-2021 Charlie Poole, 2014-2024 Terje Sandstrom</copyright>
+    <copyright>Copyright (c) 2011-2021 Charlie Poole, 2014-2025 Terje Sandstrom</copyright>
     <language>en-US</language>
     <tags>test visualstudio testadapter nunit nunit3 dotnet</tags>
 
     <developmentDependency>false</developmentDependency>
+
+    <dependencies>
+      <group targetFramework="net462">
+        <dependency id="Microsoft.Testing.Extensions.VSTestBridge" version="1.5.3" />
+        <dependency id="Microsoft.Testing.Platform.MSBuild" version="1.5.3" />
+      </group>
+      <group targetFramework="netcoreapp3.1">
+        <dependency id="Microsoft.Testing.Extensions.VSTestBridge" version="1.5.3" />
+        <dependency id="Microsoft.Testing.Platform.MSBuild" version="1.5.3" />
+      </group>
+    </dependencies>
   </metadata>
   <files>
     <file src="..\..\images\nunit_256.png" target="" />
@@ -36,6 +47,7 @@
     <file src="build\net462\nunit.engine.core.dll" target="build\net462\nunit.engine.core.dll" />
     <file src="build\net462\testcentric.engine.metadata.dll" target="build\net462\testcentric.engine.metadata.dll"/>
     <file src="build\net462\NUnit3TestAdapter.props" target="build\net462\NUnit3TestAdapter.props" />
+    <file src="build\net462\NUnit3TestAdapter.targets" target="build\net462\NUnit3TestAdapter.targets" />
 
     <file src="build\netcoreapp3.1\NUnit3.TestAdapter.dll" target="build\netcoreapp3.1\NUnit3.TestAdapter.dll" />
     <file src="build\netcoreapp3.1\NUnit3.TestAdapter.pdb" target="build\netcoreapp3.1\NUnit3.TestAdapter.pdb" />
@@ -44,6 +56,7 @@
     <file src="build\netcoreapp3.1\nunit.engine.core.dll" target="build\netcoreapp3.1\nunit.engine.core.dll" />
     <file src="build\netcoreapp3.1\testcentric.engine.metadata.dll" target="build\netcoreapp3.1\testcentric.engine.metadata.dll"/>
     <file src="build\netcoreapp3.1\NUnit3TestAdapter.props" target="build\netcoreapp3.1\NUnit3TestAdapter.props" />
+    <file src="build\netcoreapp3.1\NUnit3TestAdapter.targets" target="build\netcoreapp3.1\NUnit3TestAdapter.targets" />
 
 
   </files>

diff --git a/nuget/net462/NUnit3TestAdapter.props b/nuget/net462/NUnit3TestAdapter.props
@@ -1,11 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+    <EnableNUnitRunner Condition=" '$(EnableNUnitRunner)' == '' ">false</EnableNUnitRunner>
+    <IsTestingPlatformApplication>$(EnableNUnitRunner)</IsTestingPlatformApplication>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!--
+      !!! IMPORTANT !!!
+      DO NOT CHANGE THE GUID, IT'S A WELL KNOWN EXTENSION POINT AND THIS EXTENSION NEEDS TO BE REGISTERED AT THE END
+      WE HAVE CODE INSIDE THE TASK 'TestingPlatformEntryPoint' TO ENSURE THE ORDER OF THE REGISTRATION BASED ON THIS GUID
+    -->
+    <TestingPlatformBuilderHook Include="2E8E7F63-61DB-4EDB-A21E-5BF48279A7B8" Condition=" $(GenerateTestingPlatformEntryPoint) == 'true' " >
+      <DisplayName>NUnit</DisplayName>
+      <TypeFullName>NUnit.VisualStudio.TestAdapter.TestingPlatformAdapter.TestingPlatformBuilderHook</TypeFullName>
+    </TestingPlatformBuilderHook>
+  </ItemGroup>
+
   <ItemGroup>
-    <None Include="$(MSBuildThisFileDirectory)NUnit3.TestAdapter.dll">
-      <Link>NUnit3.TestAdapter.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>False</Visible>
-    </None>
     <None Include="$(MSBuildThisFileDirectory)NUnit3.TestAdapter.pdb" Condition="Exists('$(MSBuildThisFileDirectory)NUnit3.TestAdapter.pdb')">
       <Link>NUnit3.TestAdapter.pdb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

diff --git a/nuget/net462/NUnit3TestAdapter.targets b/nuget/net462/NUnit3TestAdapter.targets
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- Handle the coexistance between Microsoft.Testing.Platform and Microsoft.NET.Test.Sdk  -->
+  <PropertyGroup>
+    <GenerateTestingPlatformEntryPoint Condition=" '$(GenerateTestingPlatformEntryPoint)' == '' ">$(EnableNUnitRunner)</GenerateTestingPlatformEntryPoint>
+    <GenerateSelfRegisteredExtensions Condition=" '$(GenerateSelfRegisteredExtensions)' == '' ">$(EnableNUnitRunner)</GenerateSelfRegisteredExtensions>
+    <DisableTestingPlatformServerCapability Condition=" '$(EnableNUnitRunner)' == 'false' or '$(EnableNUnitRunner)' == '' " >true</DisableTestingPlatformServerCapability>
+    <GenerateProgramFile Condition=" '$(EnableNUnitRunner)' == 'true' ">false</GenerateProgramFile>
+  </PropertyGroup>   
+
+  <Choose>
+    <!-- Avoid false warning about missing reference (msbuild bug) -->
+    <!-- https://github.com/dotnet/msbuild/issues/9698#issuecomment-1945763467 -->
+    <When Condition=" '$(EnableNUnitRunner)' == 'true' ">
+      <ItemGroup>
+        <Reference Include="NUnit3.TestAdapter">
+          <HintPath>$(MSBuildThisFileDirectory)NUnit3.TestAdapter.dll</HintPath>
+        </Reference>
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+       <None Include="$(MSBuildThisFileDirectory)NUnit3.TestAdapter.dll">
+         <Link>NUnit3.TestAdapter.dll</Link>
+         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+         <Visible>False</Visible>
+       </None>
+     </ItemGroup>
+    </Otherwise>
+  </Choose>
+
+</Project>
diff --git a/nuget/netcoreapp3.1/NUnit3TestAdapter.props b/nuget/netcoreapp3.1/NUnit3TestAdapter.props
@@ -1,11 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+    <EnableNUnitRunner Condition=" '$(EnableNUnitRunner)' == '' ">false</EnableNUnitRunner>
+    <IsTestingPlatformApplication>$(EnableNUnitRunner)</IsTestingPlatformApplication>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!--
+      !!! IMPORTANT !!!
+      DO NOT CHANGE THE GUID, IT'S A WELL KNOWN EXTENSION POINT AND THIS EXTENSION NEEDS TO BE REGISTERED AT THE END
+      WE HAVE CODE INSIDE THE TASK 'TestingPlatformEntryPoint' TO ENSURE THE ORDER OF THE REGISTRATION BASED ON THIS GUID
+    -->
+    <TestingPlatformBuilderHook Include="2E8E7F63-61DB-4EDB-A21E-5BF48279A7B8" Condition=" $(GenerateTestingPlatformEntryPoint) == 'true' " >
+      <DisplayName>NUnit</DisplayName>
+      <TypeFullName>NUnit.VisualStudio.TestAdapter.TestingPlatformAdapter.TestingPlatformBuilderHook</TypeFullName>
+    </TestingPlatformBuilderHook>
+  </ItemGroup>    
+
   <ItemGroup>
-    <None Include="$(MSBuildThisFileDirectory)NUnit3.TestAdapter.dll">
-      <Link>NUnit3.TestAdapter.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>False</Visible>
-    </None>
     <None Include="$(MSBuildThisFileDirectory)NUnit3.TestAdapter.pdb" Condition="Exists('$(MSBuildThisFileDirectory)NUnit3.TestAdapter.pdb')">
       <Link>NUnit3.TestAdapter.pdb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

diff --git a/nuget/netcoreapp3.1/NUnit3TestAdapter.targets b/nuget/netcoreapp3.1/NUnit3TestAdapter.targets
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- Handle the coexistance between Microsoft.Testing.Platform and Microsoft.NET.Test.Sdk  -->
+  <PropertyGroup>
+    <GenerateTestingPlatformEntryPoint Condition=" '$(GenerateTestingPlatformEntryPoint)' == '' ">$(EnableNUnitRunner)</GenerateTestingPlatformEntryPoint>
+    <GenerateSelfRegisteredExtensions Condition=" '$(GenerateSelfRegisteredExtensions)' == '' ">$(EnableNUnitRunner)</GenerateSelfRegisteredExtensions>
+    <DisableTestingPlatformServerCapability Condition=" '$(EnableNUnitRunner)' == 'false' or '$(EnableNUnitRunner)' == '' " >true</DisableTestingPlatformServerCapability>
+    <GenerateProgramFile Condition=" '$(EnableNUnitRunner)' == 'true' ">false</GenerateProgramFile>
+  </PropertyGroup>   
+
+  <Choose>
+    <!-- Avoid false warning about missing reference (msbuild bug) -->
+    <!-- https://github.com/dotnet/msbuild/issues/9698#issuecomment-1945763467 -->
+    <When Condition=" '$(EnableNUnitRunner)' == 'true' ">
+      <ItemGroup>
+        <Reference Include="NUnit3.TestAdapter">
+          <HintPath>$(MSBuildThisFileDirectory)NUnit3.TestAdapter.dll</HintPath>
+        </Reference>
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+       <None Include="$(MSBuildThisFileDirectory)NUnit3.TestAdapter.dll">
+         <Link>NUnit3.TestAdapter.dll</Link>
+         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+         <Visible>False</Visible>
+       </None>
+     </ItemGroup>
+    </Otherwise>
+  </Choose>
+
+</Project>
diff --git a/src/NUnit.TestAdapter.Tests.Acceptance/AcceptanceTests.cs b/src/NUnit.TestAdapter.Tests.Acceptance/AcceptanceTests.cs
@@ -38,15 +38,12 @@ public abstract class AcceptanceTests
     protected static IEnumerable<string> DotNetCliTargetFrameworks =>
     [
         Frameworks.NetCoreApp31,
-        Frameworks.Net50,
         Frameworks.Net60,
-        Frameworks.Net70
     ];
 
     protected static IEnumerable<string> ModernDotNetCliTargetFrameworks =>
     [
         Frameworks.Net60,
-        Frameworks.Net70,
         Frameworks.Net80
     ];
 
@@ -95,11 +92,6 @@ public class SingleFrameworkSource
                 Framework = Frameworks.NetCoreApp31,
                 NUnitVersion = NUnit3
             },
-            new ()
-            {
-                Framework = Frameworks.Net50,
-                NUnitVersion = NUnit3
-            }
         ];
 
         public static IEnumerable<SingleFrameworkSource> ModernDotNetFramework =>
@@ -110,11 +102,6 @@ public class SingleFrameworkSource
                 NUnitVersion = NUnit4
             },
             new ()
-            {
-                Framework = Frameworks.Net70,
-                NUnitVersion = NUnit4
-            },
-            new ()
             {
                 Framework = Frameworks.Net80,
                 NUnitVersion = NUnit4
@@ -128,8 +115,7 @@ public class SingleFrameworkSource
     protected string NUnitVersion(string targetFramework) =>
         targetFramework switch
         {
-            Frameworks.NetCoreApp31
-                or Frameworks.Net50 => NUnit3,
+            Frameworks.NetCoreApp31 => NUnit3,
             _ => NUnit4,
         };
 

diff --git a/src/NUnit.TestAdapter.Tests.Acceptance/SinglePassingTestResultTests.cs b/src/NUnit.TestAdapter.Tests.Acceptance/SinglePassingTestResultTests.cs
@@ -418,6 +418,7 @@ public void Legacy_csproj_with_packages_config()
                       </Target>
                       <Import Project='packages\Microsoft.CodeCoverage.15.9.0\build\netstandard1.0\Microsoft.CodeCoverage.targets' Condition=""Exists('packages\Microsoft.CodeCoverage.15.9.0\build\netstandard1.0\Microsoft.CodeCoverage.targets')"" />
                       <Import Project='packages\Microsoft.NET.Test.Sdk.15.9.0\build\net45\Microsoft.Net.Test.Sdk.targets' Condition=""Exists('packages\Microsoft.NET.Test.Sdk.15.9.0\build\net45\Microsoft.Net.Test.Sdk.targets')"" />
+                      <Import Project='packages\NUnit3TestAdapter.{NuGetPackageVersion}\build\{LowestNetfxTarget}\NUnit3TestAdapter.targets' Condition=""Exists('packages\NUnit3TestAdapter.{NuGetPackageVersion}\build\{LowestNetfxTarget}\NUnit3TestAdapter.targets')"" />
                     </Project>");
 
         AddPackagesConfig(workspace);
@@ -531,6 +532,7 @@ public void Legacy_vbproj_with_packages_config()
                       </Target>
                       <Import Project='packages\Microsoft.CodeCoverage.15.9.0\build\netstandard1.0\Microsoft.CodeCoverage.targets' Condition=""Exists('packages\Microsoft.CodeCoverage.15.9.0\build\netstandard1.0\Microsoft.CodeCoverage.targets')"" />
                       <Import Project='packages\Microsoft.NET.Test.Sdk.15.9.0\build\net45\Microsoft.Net.Test.Sdk.targets' Condition=""Exists('packages\Microsoft.NET.Test.Sdk.15.9.0\build\net45\Microsoft.Net.Test.Sdk.targets')"" />
+                      <Import Project='packages\NUnit3TestAdapter.{NuGetPackageVersion}\build\{LowestNetfxTarget}\NUnit3TestAdapter.targets' Condition=""Exists('packages\NUnit3TestAdapter.{NuGetPackageVersion}\build\{LowestNetfxTarget}\NUnit3TestAdapter.targets')"" />
                     </Project>");
 
         AddPackagesConfig(workspace);

diff --git a/src/NUnitTestAdapter/NUnit.TestAdapter.csproj b/src/NUnitTestAdapter/NUnit.TestAdapter.csproj
@@ -10,8 +10,8 @@
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <SourceLinkOriginUrl>https://github.com/nunit/nunit3-vs-adapter</SourceLinkOriginUrl>
     <SourceLinkCreate>true</SourceLinkCreate>
-    <AssemblyVersion>4.6.0.0</AssemblyVersion>
-    <FileVersion>4.6.0.0</FileVersion>
+    <AssemblyVersion>5.0.0.0</AssemblyVersion>
+    <FileVersion>5.0.0.0</FileVersion>
     <NeutralLanguage>en</NeutralLanguage>
     <Title>NUnit3 Test Adapter for Visual Studio</Title>
     <Copyright>Copyright © 2011-2021 Charlie Poole, 2014-2024 Terje Sandstrom</Copyright>
@@ -32,19 +32,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SourceLink.Create.CommandLine"  PrivateAssets="All" />
+      <PackageReference Include="Microsoft.Testing.Extensions.VSTestBridge" />
+      <PackageReference Include="SourceLink.Create.CommandLine"  PrivateAssets="All" />
     <PackageReference Include="nunit.engine" />
     <PackageReference Include="TestCentric.Metadata" Aliases="TestCentric" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
-    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" VersionOverride="11.0.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
-    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" VersionOverride="15.0.0" />
-  </ItemGroup>
-
   <ItemGroup>
     <Folder Include="TestFilterConverter\" />
   </ItemGroup>