Update version information in System.Private.CoreLib to mimic CoreCLR and make Benchm...
authorFilip Navara <navara@emclient.com>
Tue, 27 Aug 2019 20:55:37 +0000 (22:55 +0200)
committerAlexander Köplinger <alex.koeplinger@outlook.com>
Tue, 27 Aug 2019 20:55:37 +0000 (22:55 +0200)
BenchmarkDotNet recently updated the algorithms for .NET version detection (https://github.com/dotnet/BenchmarkDotNet/pull/1230) which made it incompatible with the version presented by Mono.

This updates the value of [ProductName](https://github.com/dotnet/coreclr/blob/mono/mono@1f428dbc5554191dadd27511cd5cd181e4a60efb/Directory.Build.targets#L7) and [Version](https://github.com/dotnet/coreclr/blob/mono/mono@c9007e73286456434ba12744e778e87a89fc1d90/eng/Versions.props#L5) to match what CoreCLR is currently reporting and makes the [BDN detection code](https://github.com/dotnet/BenchmarkDotNet/blob/mono/mono@b6d0e0f1d80ed60aa157149a0dfb704a2da4ca41/src/BenchmarkDotNet/Environments/Runtimes/CoreRuntime.cs#L73-L81) happy.

Commit migrated from https://github.com/mono/mono/commit/f4145ce10815b2f4a1d585dbdf462aa17015aed1

src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj

index aab3bfe..d8e6eb5 100644 (file)
@@ -97,6 +97,8 @@
 
   <!-- Assembly attributes -->
   <PropertyGroup>
+    <!-- SDK sets product to assembly but we want it to be our product name -->
+    <Product>Microsoft%AE .NET Core</Product>
     <AssemblyName>System.Private.CoreLib</AssemblyName>
     <AssemblyVersion>5.0.0.0</AssemblyVersion>
     <ExcludeAssemblyInfoPartialFile>true</ExcludeAssemblyInfoPartialFile>