Remove InProcess check from validation.

Update Weaver.

Author: timcassell

src/BenchmarkDotNet.Weaver/BenchmarkDotNet.Weaver.csproj

@@ -4,10 +4,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\build\common.props" />
   <PropertyGroup>
-	<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
-	<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-	<OutputPath>$(MSBuildThisFileDirectory)bin\$(Configuration)</OutputPath>
+	<TargetFrameworks>netstandard2.0</TargetFrameworks>
 	<VersionSuffix Condition="'$(IsFullPack)' != 'true'">$(VersionSuffix)$(WeaverVersionSuffix)</VersionSuffix>
+	<OutputPath>$(MSBuildThisFileDirectory)bin\$(Configuration)</OutputPath>
+	<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+	<IncludeBuildOutput>false</IncludeBuildOutput>
+	<NoWarn>$(NoWarn);NU5100;NU5128</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -19,7 +21,7 @@
   <ItemGroup>
 	<!-- Include .targets file and all DLLs in the output directory in the NuGet package -->
 	<Content Include="$(MSBuildThisFileDirectory)buildTransitive\**\*.targets" Pack="true" PackagePath="buildTransitive" />
-	<Content Include="$(OutputPath)**\*.dll" Exclude="$(OutputPath)**\$(AssemblyName).dll" Pack="true" PackagePath="lib/$(TargetFramework)" />
+	<Content Include="$(OutputPath)**\*.dll" Pack="true" PackagePath="tasks/$(TargetFramework)" />
 	<None Remove="packages\**" />
   </ItemGroup>
 </Project>

src/BenchmarkDotNet.Weaver/buildTransitive/net461/BenchmarkDotNet.Weaver.targets

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <UsingTask TaskName="BenchmarkDotNet.Weaver.WeaveAssembliesTask" AssemblyFile="$(MSBuildThisFileDirectory)..\..\lib\netstandard2.0\BenchmarkDotNet.Weaver.dll" />
+  <UsingTask TaskName="BenchmarkDotNet.Weaver.WeaveAssemblyTask" AssemblyFile="$(MSBuildThisFileDirectory)..\..\tasks\netstandard2.0\BenchmarkDotNet.Weaver.dll" />
 
-  <!-- .Net Framework causes "warning MSB3026: Could not copy ... The file is locked by: .NET Host" when the weaver task is ran on the user's project
-	   when the wrapper project is built. So DotNetCliCommand disables it globally, and the wrapper project enables it only for itself. -->
-  <Target Name="WeaveAssemblies" AfterTargets="AfterBuild" Condition="'$(BenchmarkDotNetSkipWeaver)' != 'true' Or '$(BenchmarkDotNetWrapperProj)' == 'true'">
-	<WeaveAssembliesTask TargetDir="$(TargetDir)" TargetAssembly="$(TargetDir)$(TargetFileName)" />
+  <Target Name="WeaveAssemblies" AfterTargets="AfterBuild" >
+	<WeaveAssemblyTask TargetDir="$(TargetDir)" TargetAssembly="$(TargetDir)$(TargetFileName)" />
   </Target>
 </Project>

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

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using Microsoft.Build.Framework;
@@ -10,17 +9,19 @@ namespace BenchmarkDotNet.Weaver;
 
 internal class CustomAssemblyResolver : DefaultAssemblyResolver
 {
-    public override AssemblyDefinition Resolve(AssemblyNameReference name, ReaderParameters parameters)
-        // Fix StackOverflow https://github.com/jbevain/cecil/issues/573
-        => name.FullName.StartsWith("netstandard") || name.FullName.StartsWith("mscorlib") || name.FullName.StartsWith("System.Private.CoreLib")
-            ? AssemblyDefinition.ReadAssembly(Path.Combine(Path.GetDirectoryName(typeof(object).Assembly.Location), Path.ChangeExtension(name.Name, ".dll")), parameters)
-            : base.Resolve(name, parameters);
+    public override AssemblyDefinition Resolve(AssemblyNameReference name, ReaderParameters parameters)
+        // NetStandard causes StackOverflow. https://github.com/jbevain/cecil/issues/573
+        // Mscorlib fails to resolve in Visual Studio. https://github.com/jbevain/cecil/issues/966
+        // We don't care about any types from these assemblies anyway, so just skip resolving them.
+        => name.Name is "netstandard" or "mscorlib" or "System.Runtime" or "System.Private.CoreLib"
+            ? null// AssemblyDefinition.ReadAssembly(Path.Combine(Path.GetDirectoryName(typeof(object).Assembly.Location), Path.ChangeExtension(name.Name, ".dll")))
+            : base.Resolve(name, parameters);
 }
 
 /// <summary>
 /// The Task used by MSBuild to weave the assemblies.
 /// </summary>
-public sealed class WeaveAssembliesTask : Task
+public sealed class WeaveAssemblyTask : Task
 {
     /// <summary>
     /// The directory of the output.
@@ -29,13 +30,11 @@ public sealed class WeaveAssembliesTask : Task
     public string TargetDir { get; set; }
 
     /// <summary>
-    /// The path of the target assemblies.
+    /// The path of the target assembly.
     /// </summary>
     [Required]
     public string TargetAssembly { get; set; }
 
-    private readonly List<string> _warningMessages = [$"Benchmark methods were found in 1 or more assemblies that require NoInlining, and assembly weaving failed."];
-
     /// <summary>
     /// Runs the weave assemblies task.
     /// </summary>
@@ -49,44 +48,20 @@ public override bool Execute()
         }
 
         var resolver = new CustomAssemblyResolver();
-        resolver.AddSearchDirectory(TargetDir);
+        resolver.AddSearchDirectory(TargetDir);
 
         // ReaderParameters { ReadWrite = true } is necessary to later write the file.
         // https://stackoverflow.com/questions/41840455/locked-target-assembly-with-mono-cecil-and-pcl-code-injection
         var readerParameters = new ReaderParameters
         {
             ReadWrite = true,
             AssemblyResolver = resolver
-        };
-
-        ProcessAssembly(TargetAssembly, readerParameters, out bool isExecutable);
-
-        foreach (var assemblyPath in Directory.GetFiles(TargetDir, "*.dll"))
-        {
-            if (assemblyPath == TargetAssembly)
-            {
-                continue;
-            }
-            ProcessAssembly(assemblyPath, readerParameters, out _);
-        }
-
-        // Assembly resolution can fail for library projects that contain references if the project does not have <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>.
-        // Because the library project could be built as a dependency of the executable, we only log the warning if the target assembly is executable.
-        if (_warningMessages.Count > 1 && isExecutable)
-        {
-            Log.LogWarning(string.Join(Environment.NewLine, _warningMessages));
-        }
-        return true;
-    }
-
-    private void ProcessAssembly(string assemblyPath, ReaderParameters readerParameters, out bool isExecutable)
-    {
-        isExecutable = false;
+        };
+
         bool benchmarkMethodsImplAdjusted = false;
         try
         {
-            using var module = ModuleDefinition.ReadModule(assemblyPath, readerParameters);
-            isExecutable = module.EntryPoint != null;
+            using var module = ModuleDefinition.ReadModule(TargetAssembly, readerParameters);
 
             foreach (var type in module.Types)
             {
@@ -99,10 +74,11 @@ private void ProcessAssembly(string assemblyPath, ReaderParameters readerParamet
         catch (Exception e)
         {
             if (benchmarkMethodsImplAdjusted)
-            {
-                _warningMessages.Add($"Assembly: {assemblyPath}, error: {e.Message}");
+            {
+                Log.LogWarning($"Benchmark methods were found that require NoInlining, and assembly weaving failed.{Environment.NewLine}{e}");
             }
         }
+        return true;
     }
 
     private void ProcessType(TypeDefinition type, ref bool benchmarkMethodsImplAdjusted)
@@ -116,7 +92,7 @@ private void ProcessType(TypeDefinition type, ref bool benchmarkMethodsImplAdjus
         // Remove AggressiveInlining and add NoInlining to all [Benchmark] methods.
         foreach (var method in type.Methods)
         {
-            if (method.CustomAttributes.Any(attr => attr.AttributeType.FullName == "BenchmarkDotNet.Attributes.BenchmarkAttribute"))
+            if (method.CustomAttributes.Any(IsBenchmarkAttribute))
             {
                 var oldImpl = method.ImplAttributes;
                 method.ImplAttributes = (oldImpl & ~MethodImplAttributes.AggressiveInlining) | MethodImplAttributes.NoInlining;
@@ -130,4 +106,17 @@ private void ProcessType(TypeDefinition type, ref bool benchmarkMethodsImplAdjus
             ProcessType(nestedType, ref benchmarkMethodsImplAdjusted);
         }
     }
+
+    private bool IsBenchmarkAttribute(CustomAttribute attribute)
+    {
+        // BenchmarkAttribute is unsealed, so we need to walk its hierarchy.
+        for (var attr = attribute.AttributeType; attr != null; attr = attr.Resolve()?.BaseType)
+        {
+            if (attr.FullName == "BenchmarkDotNet.Attributes.BenchmarkAttribute")
+            {
+                return true;
+            }
+        }
+        return false;
+    }
 }

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

@@ -28,7 +28,6 @@
     <ValidateExecutableReferencesMatchSelfContained>false</ValidateExecutableReferencesMatchSelfContained>
     <!-- Suppress warning for nuget package used in old (unsupported) tfm. -->
     <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
-    <BenchmarkDotNetWrapperProj>true</BenchmarkDotNetWrapperProj>
     <StartupObject>BenchmarkDotNet.Autogenerated.UniqueProgramName</StartupObject>
   </PropertyGroup>
 

src/BenchmarkDotNet.Weaver/src/WeaveAssembliesTask.cs renamed to src/BenchmarkDotNet.Weaver/src/WeaveAssemblyTask.cs

@@ -22,7 +22,6 @@
     <SelfContained>true</SelfContained>
     <!-- Suppress warning for nuget package used in old (unsupported) tfm. -->
     <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
-    <BenchmarkDotNetWrapperProj>true</BenchmarkDotNetWrapperProj>
   </PropertyGroup>
 
   <ItemGroup>

src/BenchmarkDotNet/Templates/CsProj.txt

@@ -28,7 +28,6 @@
     <EnableDefaultWasmAssembliesToBundle>false</EnableDefaultWasmAssembliesToBundle>
     <!-- Suppress warning for nuget package used in old (unsupported) tfm. -->
     <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
-    <BenchmarkDotNetWrapperProj>true</BenchmarkDotNetWrapperProj>
     <StartupObject>BenchmarkDotNet.Autogenerated.UniqueProgramName</StartupObject>
   </PropertyGroup>
 

src/BenchmarkDotNet/Templates/MonoAOTLLVMCsProj.txt

@@ -218,17 +218,14 @@ private static string GetMandatoryMsBuildSettings(string buildConfiguration)
             // we use these settings to make sure that MSBuild does the job and simply quits without spawning any long living processes
             // we want to avoid "file in use" and "zombie processes" issues
             const string NoMsBuildZombieProcesses = "/p:UseSharedCompilation=false /p:BuildInParallel=false /m:1 /p:Deterministic=true";
-            // .Net Framework causes "warning MSB3026: Could not copy ... The file is locked by: .NET Host" when the weaver task is ran
-            // on the user's project when the wrapper project is built. So we disable it globally, and enable it only for the wrapper project.
-            const string SkipWeaver = "/p:BenchmarkDotNetSkipWeaver=true";
             const string EnforceOptimizations = "/p:Optimize=true";
 
             if (string.Equals(buildConfiguration, RuntimeInformation.DebugConfigurationName, StringComparison.OrdinalIgnoreCase))
             {
-                return $"{NoMsBuildZombieProcesses} {SkipWeaver}";
+                return NoMsBuildZombieProcesses;
             }
 
-            return $"{NoMsBuildZombieProcesses} {EnforceOptimizations} {SkipWeaver}";
+            return $"{NoMsBuildZombieProcesses} {EnforceOptimizations}";
         }
 
         private static string BuildAddPackageCommand(NuGetReference reference)

src/BenchmarkDotNet/Templates/WasmCsProj.txt

@@ -144,7 +144,6 @@ private string GenerateProjectForNuGetBuild(BuildPartition buildPartition, Artif
     <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles> <!-- workaround for 'Found multiple publish output files with the same relative path.' error -->
     <ValidateExecutableReferencesMatchSelfContained>false</ValidateExecutableReferencesMatchSelfContained>
     <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings> <!-- Suppress warning for nuget package used in old (unsupported) tfm. -->
-    <BenchmarkDotNetWrapperProj>true</BenchmarkDotNetWrapperProj>
     {GetInstructionSetSettings(buildPartition)}
   </PropertyGroup>
   {GetRuntimeSettings(buildPartition.RepresentativeBenchmarkCase.Job.Environment.Gc, buildPartition.Resolver)}

src/BenchmarkDotNet/Toolchains/DotNetCli/DotNetCliCommand.cs

@@ -97,8 +97,7 @@ private static IEnumerable<ValidationError> ValidateBindingModifiers(IEnumerable
                               ));
 
         private static IEnumerable<ValidationError> ValidateMethodImpl(IEnumerable<BenchmarkCase> benchmarks)
-            // Only InProcess toolchains need this validation. Build toolchains run the assembly weaver to automatically apply the MethodImpl flag.
-            => benchmarks.Where(x => !x.Descriptor.WorkloadMethod.MethodImplementationFlags.HasFlag(MethodImplAttributes.NoInlining) && x.GetToolchain().IsInProcess)
+            => benchmarks.Where(x => !x.Descriptor.WorkloadMethod.MethodImplementationFlags.HasFlag(MethodImplAttributes.NoInlining))
                 .Distinct(BenchmarkMethodEqualityComparer.Instance)
                 .Select(benchmark
                     => new ValidationError(