diff --git a/BenchmarkDotNet.slnx b/BenchmarkDotNet.slnx
index bc1d9c6fea..df9599c179 100644
--- a/BenchmarkDotNet.slnx
+++ b/BenchmarkDotNet.slnx
@@ -5,6 +5,7 @@
   </Folder>
   <Folder Name="/samples/">
     <File Path="samples/Directory.Build.props" />
+    <File Path="samples/Directory.Build.targets" />
     <Project Path="samples/BenchmarkDotNet.Samples.FSharp/BenchmarkDotNet.Samples.FSharp.fsproj" />
     <Project Path="samples/BenchmarkDotNet.Samples/BenchmarkDotNet.Samples.csproj" DefaultStartup="true" />
   </Folder>
@@ -28,6 +29,7 @@
   </Folder>
   <Folder Name="/tests/">
     <File Path="tests/Directory.Build.props" />
+    <File Path="tests/Directory.Build.targets" />
     <Project Path="tests/BenchmarkDotNet.Analyzers.Tests/BenchmarkDotNet.Analyzers.Tests.csproj" />
     <Project Path="tests/BenchmarkDotNet.Exporters.Plotting.Tests/BenchmarkDotNet.Exporters.Plotting.Tests.csproj" />
     <Project Path="tests/BenchmarkDotNet.IntegrationTests.ConfigPerAssembly/BenchmarkDotNet.IntegrationTests.ConfigPerAssembly.csproj" />
diff --git a/samples/BenchmarkDotNet.Samples/BenchmarkDotNet.Samples.csproj b/samples/BenchmarkDotNet.Samples/BenchmarkDotNet.Samples.csproj
index f69b3085a1..68894bcc17 100644
--- a/samples/BenchmarkDotNet.Samples/BenchmarkDotNet.Samples.csproj
+++ b/samples/BenchmarkDotNet.Samples/BenchmarkDotNet.Samples.csproj
@@ -40,5 +40,6 @@
     <!-- Enables analyzers for this project (this is required since ProjectReference is not transitive). -->
     <ProjectReference Include="..\..\src\BenchmarkDotNet.Analyzers\BenchmarkDotNet.Analyzers.csproj" ReferenceOutputAssembly="false" OutputItemType="Analyzer" />
   </ItemGroup>
+
   <Import Project="..\..\build\common.targets" />
 </Project>
diff --git a/samples/Directory.Build.targets b/samples/Directory.Build.targets
new file mode 100644
index 0000000000..100d75c087
--- /dev/null
+++ b/samples/Directory.Build.targets
@@ -0,0 +1,4 @@
+<Project>
+  <!-- Manually import `BenchmarkDotNet.targets` for build that using ProjectReference -->
+  <Import Project="$(MSBuildThisFileDirectory)..\src\BenchmarkDotNet\BenchmarkDotNet.targets" />
+</Project>
diff --git a/src/BenchmarkDotNet/BenchmarkDotNet.targets b/src/BenchmarkDotNet/BenchmarkDotNet.targets
index cb69f6ce31..110a9cde82 100644
--- a/src/BenchmarkDotNet/BenchmarkDotNet.targets
+++ b/src/BenchmarkDotNet/BenchmarkDotNet.targets
@@ -1,10 +1,10 @@
-<Project>
+<Project>
 
   <PropertyGroup>
     <!-- If the RuntimeIdentifier is explicitly specified. Use the specified target platform. -->
     <BenchmarkDotNetTargetPlatform>$(RuntimeIdentifier)</BenchmarkDotNetTargetPlatform>
   </PropertyGroup>
-  
+
   <PropertyGroup Condition="'$(BenchmarkDotNetTargetPlatform)' == ''">
     <!-- If RuntimeIdentifier is not specified Use current build platform -->
     <!-- List of runtimes supported by Gee.External.Capstone: https://github.com/9ee1/Capstone.NET/tree/master/Gee.External.Capstone/runtimes -->
@@ -18,7 +18,7 @@
     <BenchmarkDotNetTargetPlatform Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'Arm64'">$(BenchmarkDotNetTargetPlatform)-arm64</BenchmarkDotNetTargetPlatform>
   </PropertyGroup>
 
-  <Target Name="FilterBenchmarkDotNetPackageAssets" AfterTargets="ResolvePackageAssets">
+  <Target Name="BdnFilterPackageAssets" AfterTargets="ResolvePackageAssets">
     <!-- Remove `runtimes/{RuntimeIdentifier}` files that is not matched to target platform. -->
     <ItemGroup Condition="'$(BenchmarkDotNetTargetPlatform)' != '' AND $(BenchmarkDotNetTargetPlatform) != 'all'">
       <RuntimeTargetsCopyLocalItems Remove="@(RuntimeTargetsCopyLocalItems)"
@@ -27,8 +27,21 @@
 
     <!-- Remove unnecessary satellite assemblies. -->
     <ItemGroup>
-      <ResourceCopyLocalItems Remove="@(ResourceCopyLocalItems)"
-                              Condition="'%(ResourceCopyLocalItems.NuGetPackageId)' == 'Microsoft.CodeAnalysis.Common' OR '%(ResourceCopyLocalItems.NuGetPackageId)' == 'Microsoft.CodeAnalysis.CSharp'"/>
+      <ResourceCopyLocalItems
+        Remove="@(ResourceCopyLocalItems)"
+        Condition="'%(ResourceCopyLocalItems.NuGetPackageId)' == 'Microsoft.CodeAnalysis.Common'
+                   OR
+                   '%(ResourceCopyLocalItems.NuGetPackageId)' == 'Microsoft.CodeAnalysis.CSharp'
+                   OR
+                   '%(ResourceCopyLocalItems.NuGetPackageId)' == 'Microsoft.TestPlatform.AdapterUtilities'
+                   OR
+                   '%(ResourceCopyLocalItems.NuGetPackageId)' == 'Microsoft.TestPlatform.ObjectModel'
+                   OR
+                   '%(ResourceCopyLocalItems.NuGetPackageId)' == 'Microsoft.TestPlatform.TestHost'
+                   OR
+                   '%(ResourceCopyLocalItems.NuGetPackageId)' == 'Microsoft.TestPlatform.TranslationLayer'
+                  "/>
     </ItemGroup>
   </Target>
+
 </Project>
diff --git a/tests/Directory.Build.targets b/tests/Directory.Build.targets
new file mode 100644
index 0000000000..100d75c087
--- /dev/null
+++ b/tests/Directory.Build.targets
@@ -0,0 +1,4 @@
+<Project>
+  <!-- Manually import `BenchmarkDotNet.targets` for build that using ProjectReference -->
+  <Import Project="$(MSBuildThisFileDirectory)..\src\BenchmarkDotNet\BenchmarkDotNet.targets" />
+</Project>