Don't write module if it's unnecessary.

Don't fail silently.
Remove unused property.
Embed the weaver into BenchmarkDotNet.Annotations package instead of another package dependency.

Author: timcassell

src/BenchmarkDotNet.Annotations/BenchmarkDotNet.Annotations.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <AssemblyTitle>Basic BenchmarkDotNet attributes that can be used to annotate your benchmarks</AssemblyTitle>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <NoWarn>$(NoWarn);1701;1702;1705;1591;3005;NU1702;CA1825</NoWarn>
+    <NoWarn>$(NoWarn);1701;1702;1705;1591;3005;NU1702;NU5100;CA1825</NoWarn>
     <AssemblyName>BenchmarkDotNet.Annotations</AssemblyName>
     <PackageId>BenchmarkDotNet.Annotations</PackageId>
     <RootNamespace>BenchmarkDotNet</RootNamespace>
@@ -17,9 +17,10 @@
 
   <Choose>
 	<When Condition="'$(IsFullPack)' == 'true'">
-	  <!-- ProjectReference to ensure the nuget package has a dependency on BenchmarkDotNet.Weaver using the proper version. -->
 	  <ItemGroup>
-		<ProjectReference Include="..\BenchmarkDotNet.Weaver\BenchmarkDotNet.Weaver.csproj" />
+        <!-- Include the BenchmarkDotNet.Weaver dlls in tasks without making it an explicit dependency. -->
+        <Content Include="$(MSBuildThisFileDirectory)..\BenchmarkDotNet.Weaver\bin\Release\$(TargetFramework)\**\*.dll" Pack="true" PackagePath="tasks/$(TargetFramework)" />
+        <Content Include="$(MSBuildThisFileDirectory)buildTransitive\**\*.targets" Pack="true" PackagePath="buildTransitive" />
 	  </ItemGroup>
 	</When>
 	<Otherwise>

src/BenchmarkDotNet.Annotations/buildTransitive/netstandard2.0/BenchmarkDotNet.Annotations.targets

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Reference Include="BenchmarkDotNet.Annotations">
+      <HintPath>$(MSBuildThisFileDirectory)..\..\lib\netstandard2.0\BenchmarkDotNet.Annotations.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
+  <UsingTask TaskName="BenchmarkDotNet.Weaver.WeaveAssemblyTask" AssemblyFile="$(MSBuildThisFileDirectory)..\..\tasks\netstandard2.0\BenchmarkDotNet.Weaver.dll" />
+
+  <Target Name="WeaveAssemblies" AfterTargets="AfterBuild" >
+    <WeaveAssemblyTask TargetAssembly="$(TargetDir)$(TargetFileName)" />
+  </Target>
+</Project>

src/BenchmarkDotNet.Weaver/BenchmarkDotNet.Weaver.csproj

@@ -12,8 +12,11 @@ then run `build.cmd pack-weaver`.
 	<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
 	<IncludeBuildOutput>false</IncludeBuildOutput>
 	<NoWarn>$(NoWarn);NU5100;NU5128</NoWarn>
+    <!-- AsmResolver is not signed. -->
     <SignAssembly>false</SignAssembly>
     <DelaySign>false</DelaySign>
+    <!-- Fix error NU5017: Cannot create a package that has no dependencies nor content. -->
+    <IsPackable Condition="'$(IsFullPack)' == 'true'">false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>

src/BenchmarkDotNet.Weaver/buildTransitive/netstandard2.0/BenchmarkDotNet.Weaver.targets

@@ -3,6 +3,6 @@
   <UsingTask TaskName="BenchmarkDotNet.Weaver.WeaveAssemblyTask" AssemblyFile="$(MSBuildThisFileDirectory)..\..\tasks\netstandard2.0\BenchmarkDotNet.Weaver.dll" />
 
   <Target Name="WeaveAssemblies" AfterTargets="AfterBuild" >
-    <WeaveAssemblyTask TargetDir="$(TargetDir)" TargetAssembly="$(TargetDir)$(TargetFileName)" />
+    <WeaveAssemblyTask TargetAssembly="$(TargetDir)$(TargetFileName)" />
   </Target>
 </Project>

src/BenchmarkDotNet.Weaver/packages/BenchmarkDotNet.Weaver.0.15.1-develop-1.nupkg

@@ -18,12 +18,6 @@ namespace BenchmarkDotNet.Weaver;
 /// </summary>
 public sealed class WeaveAssemblyTask : Task
 {
-    /// <summary>
-    /// The directory of the output.
-    /// </summary>
-    [Required]
-    public string TargetDir { get; set; }
-
     /// <summary>
     /// The path of the target assembly.
     /// </summary>
@@ -42,12 +36,12 @@ public override bool Execute()
             return false;
         }
 
-        // Load the assembly using AsmResolver.
-        var module = ModuleDefinition.FromFile(TargetAssembly);
 
         bool benchmarkMethodsImplAdjusted = false;
         try
         {
+            var module = ModuleDefinition.FromFile(TargetAssembly);
+
             foreach (var type in module.GetAllTypes())
             {
                 // We can skip non-public types as they are not valid for benchmarks.
@@ -68,16 +62,15 @@ public override bool Execute()
                 }
             }
 
-            // Write the modified assembly to file.
-            module.Write(TargetAssembly);
-        }
-        catch (Exception e)
-        {
             if (benchmarkMethodsImplAdjusted)
             {
-                Log.LogWarning($"Benchmark methods were found that require NoInlining, and assembly weaving failed.{Environment.NewLine}{e}");
+                module.Write(TargetAssembly);
             }
         }
+        catch (Exception e)
+        {
+            Log.LogWarning($"Assembly weaving failed. Benchmark methods found requiring NoInlining: {benchmarkMethodsImplAdjusted}. Error:{Environment.NewLine}{e}");
+        }
         return true;
     }