diff --git a/eng/Versions.props b/eng/Versions.props index 2bbe2d4d6de..96219d3ff48 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ 9.0.0-preview.2.24119.7 9.0.0-preview.2.24119.7 - 0.13.11-nightly.20231126.107 + 0.13.13-nightly.20240213.132 9.0.0-preview.2.24119.7 9.0.0-preview.2.24119.7 diff --git a/src/benchmarks/micro/MicroBenchmarks.csproj b/src/benchmarks/micro/MicroBenchmarks.csproj index 867737a3b72..2d99f00cbf5 100644 --- a/src/benchmarks/micro/MicroBenchmarks.csproj +++ b/src/benchmarks/micro/MicroBenchmarks.csproj @@ -19,6 +19,7 @@ LatestMajor + false @@ -60,6 +61,7 @@ + @@ -73,6 +75,7 @@ + diff --git a/src/benchmarks/micro/Properties/AssemblyInfo.cs b/src/benchmarks/micro/Properties/AssemblyInfo.cs new file mode 100644 index 00000000000..08d47f66651 --- /dev/null +++ b/src/benchmarks/micro/Properties/AssemblyInfo.cs @@ -0,0 +1,28 @@ +using System.IO; +using System; +using BenchmarkDotNet.Configs; +using BenchmarkDotNet.Extensions; +using System.Collections.Immutable; +using System.Reflection; + +[assembly: MicroBenchmarks.VSTestConfigSource] + +namespace MicroBenchmarks +{ + [AttributeUsage(AttributeTargets.Assembly)] + class VSTestConfigSourceAttribute : Attribute, IConfigSource + { + public VSTestConfigSourceAttribute() + { + // We only want to set an assembly-level config when it isn't being set by the entry point + // We check for this by seeing if the calling assembly is the same as the executing assembly + Config = Assembly.GetEntryAssembly() == Assembly.GetExecutingAssembly() + ? ManualConfig.CreateEmpty() + : RecommendedConfig.Create( + artifactsPath: new DirectoryInfo(Path.Combine(AppContext.BaseDirectory, "BenchmarkDotNet.Artifacts")), + mandatoryCategories: ImmutableHashSet.Create(Categories.Libraries, Categories.Runtime, Categories.ThirdParty)); + } + + public IConfig Config { get; } + } +} \ No newline at end of file