diff --git a/src/BenchmarkDotNet.Weaver/buildTransitive/netstandard2.0/BenchmarkDotNet.Weaver.targets b/src/BenchmarkDotNet.Weaver/buildTransitive/netstandard2.0/BenchmarkDotNet.Weaver.targets
index d51be29ec4..c10ef0575f 100644
--- a/src/BenchmarkDotNet.Weaver/buildTransitive/netstandard2.0/BenchmarkDotNet.Weaver.targets
+++ b/src/BenchmarkDotNet.Weaver/buildTransitive/netstandard2.0/BenchmarkDotNet.Weaver.targets
@@ -2,13 +2,27 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <UsingTask TaskName="BenchmarkDotNet.Weaver.WeaveAssemblyTask" AssemblyFile="$(MSBuildThisFileDirectory)..\..\tasks\netstandard2.0\BenchmarkDotNet.Weaver.dll" />
 
-  <Target Name="MarkShouldRunWeaveAssemblyTask" AfterTargets="Build">
-    <PropertyGroup>
-      <ShouldRunWeaveAssemblyTask>true</ShouldRunWeaveAssemblyTask>
-    </PropertyGroup>
-  </Target>
+  <PropertyGroup>
+    <BenchmarkDotNetShouldWeaveAssemblies Condition="'$(BenchmarkDotNetShouldWeaveAssemblies)' == ''">true</BenchmarkDotNetShouldWeaveAssemblies>
+    <BenchmarkDotNetWeaveAssembliesAfterTargets Condition="'$(BenchmarkDotNetWeaveAssembliesAfterTargets)' == ''">CoreCompile</BenchmarkDotNetWeaveAssembliesAfterTargets>
+    <BenchmarkDotNetWeaveAssembliesBeforeTargets Condition="'$(BenchmarkDotNetWeaveAssembliesBeforeTargets)' == ''">CopyFilesToOutputDirectory</BenchmarkDotNetWeaveAssembliesBeforeTargets>
+    <BenchmarkDotNetWeaveAssemblyPath Condition="'$(BenchmarkDotNetWeaveAssemblyPath)' == ''">$(IntermediateOutputPath)$(TargetName)$(TargetExt)</BenchmarkDotNetWeaveAssemblyPath>
+    <BenchmarkDotNetWeaveAssembliesStampFile Condition="'$(BenchmarkDotNetWeaveAssembliesStampFile)' == ''">$(IntermediateOutputPath)BenchmarkDotNetWeaver.stamp</BenchmarkDotNetWeaveAssembliesStampFile>
+  </PropertyGroup>
+  
+  <Target Name="BenchmarkDotNetWeaveAssemblies"
+      AfterTargets="$(BenchmarkDotNetWeaveAssembliesAfterTargets)"
+      BeforeTargets="$(BenchmarkDotNetWeaveAssembliesBeforeTargets)"
+      Condition="'$(BenchmarkDotNetShouldWeaveAssemblies)' == 'true'"
+      Inputs="$(BenchmarkDotNetWeaveAssemblyPath)"
+      Outputs="$(BenchmarkDotNetWeaveAssembliesStampFile)">
+
+    <WeaveAssemblyTask TargetAssembly="$(BenchmarkDotNetWeaveAssemblyPath)" />
 
-  <Target Name="WeaveAssemblies" AfterTargets="MarkShouldRunWeaveAssemblyTask" BeforeTargets="Publish" >
-    <WeaveAssemblyTask TargetAssembly="$(TargetDir)$(TargetFileName)" Condition="'$(ShouldRunWeaveAssemblyTask)' == 'true'" />
+    <!-- Create stamp file for incrementality -->
+    <Touch Files="$(BenchmarkDotNetWeaveAssembliesStampFile)" AlwaysCreate="true" />
+    <ItemGroup>
+      <FileWrites Include="$(BenchmarkDotNetWeaveAssembliesStampFile)" />
+    </ItemGroup>
   </Target>
 </Project>
\ No newline at end of file