Revert "Update versioning in build scripts"

This reverts commit b797cff.

Author: AndreyAkinshin

build/Program.cs

@@ -33,7 +33,6 @@ public class BuildContext : FrostingContext
     public string BuildConfiguration { get; set; }
     public bool SkipTests { get; set; }
     public bool SkipSlowTests { get; set; }
-    public string TargetVersion { get; set; }
 
     public DirectoryPath RootDirectory { get; }
     public DirectoryPath ArtifactsDirectory { get; }
@@ -46,6 +45,8 @@ public class BuildContext : FrostingContext
     public DirectoryPath ChangeLogGenDirectory { get; }
 
     public DirectoryPath RedirectRootDirectory { get; }
+    public DirectoryPath RedirectProjectDirectory { get; }
+    public DirectoryPath RedirectSourceDirectory { get; }
     public DirectoryPath RedirectTargetDirectory { get; }
 
     public FilePath SolutionFile { get; }
@@ -69,7 +70,6 @@ public BuildContext(ICakeContext context)
         BuildConfiguration = context.Argument("Configuration", "Release");
         SkipTests = context.Argument("SkipTests", false);
         SkipSlowTests = context.Argument("SkipSlowTests", false);
-        TargetVersion = context.Argument("Version", "");
 
         RootDirectory = new DirectoryPath(new DirectoryInfo(Directory.GetCurrentDirectory()).Parent.FullName);
         ArtifactsDirectory = RootDirectory.Combine("artifacts");
@@ -82,6 +82,8 @@ public BuildContext(ICakeContext context)
         ChangeLogGenDirectory = RootDirectory.Combine("docs").Combine("_changelog");
 
         RedirectRootDirectory = RootDirectory.Combine("docs").Combine("_redirects");
+        RedirectProjectDirectory = RedirectRootDirectory.Combine("RedirectGenerator");
+        RedirectSourceDirectory = RedirectRootDirectory.Combine("redirects");
         RedirectTargetDirectory = RootDirectory.Combine("docs").Combine("_site"); 
 
         SolutionFile = RootDirectory.CombineWithFilePath("BenchmarkDotNet.sln");
@@ -94,16 +96,11 @@ public BuildContext(ICakeContext context)
         AllPackableSrcProjects = new FilePathCollection(context.GetFiles(RootDirectory.FullPath + "/src/**/*.csproj")
             .Where(p => !p.FullPath.Contains("Disassembler")));
 
-        MsBuildSettings = new DotNetMSBuildSettings();
-        if (IsCiBuild)
+        MsBuildSettings = new DotNetMSBuildSettings
         {
-            MsBuildSettings.MaxCpuCount = 1;
-            MsBuildSettings.WithProperty("UseSharedCompilation", "false");
-            MsBuildSettings.WithProperty("CI_BUILD", "true");
-        }
-
-        if (!string.IsNullOrEmpty(TargetVersion))
-            MsBuildSettings.WithProperty("Version", TargetVersion);
+            MaxCpuCount = 1
+        };
+        MsBuildSettings.WithProperty("UseSharedCompilation", "false");
 
         // NativeAOT build requires VS C++ tools to be added to $path via vcvars64.bat
         // but once we do that, dotnet restore fails with:
@@ -413,19 +410,17 @@ public override void Run(BuildContext context)
             Configuration = context.BuildConfiguration,
             OutputDirectory = context.ArtifactsDirectory.FullPath,
             ArgumentCustomization = args => args.Append("--include-symbols").Append("-p:SymbolPackageFormat=snupkg"),
-            MSBuildSettings = context.MsBuildSettings,
-            NoBuild = true
+            MSBuildSettings = context.MsBuildSettings
         };
-
-        foreach (var project in context.AllPackableSrcProjects)
-            context.DotNetPack(project.FullPath, settingsSrc);
-        
         var settingsTemplate = new DotNetPackSettings
         {
             Configuration = context.BuildConfiguration,
             OutputDirectory = context.ArtifactsDirectory.FullPath,
             MSBuildSettings = context.MsBuildSettings
         };
+
+        foreach (var project in context.AllPackableSrcProjects)
+            context.DotNetPack(project.FullPath, settingsSrc);
         context.DotNetPack(context.TemplatesTestsProjectFile.FullPath, settingsTemplate);
     }
 }

build/common.props

@@ -23,41 +23,47 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="$(MSBuildThisFileDirectory)package-icon.png" Pack="True" PackagePath=""/>
+    <None Include="$(MSBuildThisFileDirectory)package-icon.png" Pack="True" PackagePath="" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)strongNameKey.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
-
+  
   <PropertyGroup Condition=" '$(IsVisualBasic)' != 'true' AND '$(IsFsharp)' != 'true' ">
     <LangVersion>9.0</LangVersion>
-  </PropertyGroup>
+    
+    <Major>0</Major>
+    <Minor>13</Minor>
+    <Revision>5</Revision>
 
-  <PropertyGroup Condition=" '$(VersionPrefix)' == '' ">
-    <VersionPrefix>0.13.5</VersionPrefix>
-    <VersionPrefix Condition=" '$(APPVEYOR_BUILD_NUMBER)' != '' ">$(VersionPrefix).$(APPVEYOR_BUILD_NUMBER)</VersionPrefix>
-  </PropertyGroup>
+    <BuildNumber Condition=" '$(APPVEYOR_BUILD_NUMBER)' != '' ">$(APPVEYOR_BUILD_NUMBER)</BuildNumber>
+    <BuildNumber Condition=" '$(BuildNumber)' == '' ">0</BuildNumber>
 
-  <PropertyGroup Condition=" '$(VersionSuffix)' == '' ">
-    <VersionSuffix>develop</VersionSuffix>
-    <VersionSuffix Condition=" '$(APPVEYOR_BUILD_NUMBER)' == '' AND '$(CI_BUILD)' != '' ">ci</VersionSuffix>
-  </PropertyGroup>
+    <PrereleaseLabel>-develop</PrereleaseLabel>
+    <PrereleaseLabel Condition=" '$(APPVEYOR_BUILD_NUMBER)' != '' "></PrereleaseLabel>
+    <!-- <PrereleaseLabel></PrereleaseLabel> --> <!-- For release versions only -->
 
-  <PropertyGroup>
-    <AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
-    <AssemblyFileVersion>$(VersionPrefix)</AssemblyFileVersion>
-    <InformationalVersion>$(Version)</InformationalVersion>
-    <PackageVersion>$(Version)</PackageVersion>
-  </PropertyGroup>
+    <PrereleaseLabelConstants></PrereleaseLabelConstants>
+    <PrereleaseLabelConstants Condition=" '$(PrereleaseLabel)' == '-develop' ">PRERELEASE_DEVELOP</PrereleaseLabelConstants>
+    <PrereleaseLabelConstants Condition=" '$(APPVEYOR_BUILD_NUMBER)' != '' ">PRERELEASE_NIGHTLY</PrereleaseLabelConstants>
+    <DefineConstants>$(DefineConstants);$(PrereleaseLabelConstants)</DefineConstants>
 
+    <AssemblyVersion>$(Major).$(Minor).$(Revision).$(BuildNumber)</AssemblyVersion>
+    <AssemblyFileVersion>$(Major).$(Minor).$(Revision).$(BuildNumber)</AssemblyFileVersion>
+    <InformationalVersion>$(Major).$(Minor).$(Revision).$(BuildNumber)$(PrereleaseLabel)</InformationalVersion>
+    <PackageVersion>$(Major).$(Minor).$(Revision).$(BuildNumber)$(PrereleaseLabel)</PackageVersion>
+  </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup >
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

src/BenchmarkDotNet/Disassemblers/WindowsDisassembler.cs

@@ -86,18 +86,15 @@ private static string GetDisassemblerPath(string architectureName)
             var dir = new FileInfo(assemblyWithDisassemblersInResources.Location).Directory ?? throw new DirectoryNotFoundException();
             string disassemblerPath = Path.Combine(
                 dir.FullName,
-                FolderNameHelper.ToFolderName(BenchmarkDotNetInfo.Instance.FullVersion), // possible update
+                FolderNameHelper.ToFolderName(BenchmarkDotNetInfo.FullVersion), // possible update
                 exeName); // separate process per architecture!!
 
             Path.GetDirectoryName(disassemblerPath).CreateIfNotExists();
 
-            // for development we always want to copy the file to not omit any dev changes
-            if (!BenchmarkDotNetInfo.Instance.IsDevelop)
-            {
-                if (File.Exists(disassemblerPath))
-                    return disassemblerPath;
-            }
-
+#if !PRERELEASE_DEVELOP // for development we always want to copy the file to not omit any dev changes (Properties.BenchmarkDotNetInfo.FullVersion in file name is not enough)
+            if (File.Exists(disassemblerPath))
+                return disassemblerPath;
+#endif
             // the disassembler has not been yet retrieved from the resources
             CopyFromResources(
                 assemblyWithDisassemblersInResources,

src/BenchmarkDotNet/Environments/HostEnvironmentInfo.cs

@@ -67,7 +67,7 @@ public class HostEnvironmentInfo : BenchmarkEnvironmentInfo
 
         protected HostEnvironmentInfo()
         {
-            BenchmarkDotNetVersion = BenchmarkDotNetInfo.Instance.BrandVersion;
+            BenchmarkDotNetVersion = BenchmarkDotNetInfo.FullVersion;
             OsVersion = new Lazy<string>(RuntimeInformation.GetOsVersion);
             CpuInfo = new Lazy<CpuInfo>(RuntimeInformation.GetCpuInfo);
             ChronometerFrequency = Chronometer.Frequency;

src/BenchmarkDotNet/Exporters/RPlotExporter.cs

@@ -36,7 +36,7 @@ public IEnumerable<string> ExportToFiles(Summary summary, ILogger consoleLogger)
             string logFullPath = Path.Combine(summary.ResultsDirectoryPath, logFileName);
             string script = ResourceHelper.
                 LoadTemplate(scriptFileName).
-                Replace("$BenchmarkDotNetVersion$", BenchmarkDotNetInfo.Instance.BrandTitle).
+                Replace("$BenchmarkDotNetVersion$", BenchmarkDotNetInfo.FullTitle).
                 Replace("$CsvSeparator$", CsvMeasurementsExporter.Default.Separator);
             lock (BuildScriptLock)
                 File.WriteAllText(scriptFullPath, script);

src/BenchmarkDotNet/Properties/BenchmarkDotNetInfo.cs

@@ -1,53 +1,39 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
-using BenchmarkDotNet.Extensions;
 
 namespace BenchmarkDotNet.Properties
 {
-    public class BenchmarkDotNetInfo
+    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    public static class BenchmarkDotNetInfo
     {
-        private static readonly Lazy<BenchmarkDotNetInfo> LazyInstance = new (() =>
+#if PRERELEASE_NIGHTLY
+        public const string PrereleaseLabel = "-nightly";
+#elif PRERELEASE_DEVELOP
+        public const string PrereleaseLabel = "-develop";
+#else
+        public const string PrereleaseLabel = "";
+#endif
+
+        // ReSharper disable once ConditionIsAlwaysTrueOrFalse
+        [SuppressMessage("ReSharper", "RedundantLogicalConditionalExpressionOperand")]
+        private static readonly Lazy<string> FullVersionLazy = new Lazy<string>(() =>
         {
-            var assembly = typeof(BenchmarkDotNetInfo).GetTypeInfo().Assembly;
-            var assemblyVersion = assembly.GetName().Version;
-            string informationVersion = assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion ?? "";
-            return new BenchmarkDotNetInfo(assemblyVersion, informationVersion);
+            string version = typeof(BenchmarkDotNetInfo).GetTypeInfo().Assembly.GetName().Version.ToString();
+#pragma warning disable 162
+            if (version.EndsWith(".0") && PrereleaseLabel == "")
+                version = version.Substring(0, version.Length - 2);
+            if (version.EndsWith(".0") && PrereleaseLabel == "-develop")
+                version = version.Substring(0, version.Length - 1) + DateTime.Now.ToString("yyyyMMdd");
+#pragma warning restore 162
+            return version + PrereleaseLabel;
         });
 
-        public static BenchmarkDotNetInfo Instance { get; } = LazyInstance.Value;
+        private static readonly Lazy<string> FullTitleLazy = new Lazy<string>(() => "BenchmarkDotNet v" + FullVersionLazy.Value);
 
-        public Version AssemblyVersion { get; }
-        public string FullVersion { get; }
+        public static string FullVersion => FullVersionLazy.Value;
 
-        public bool IsDevelop { get; }
-        public bool IsNightly { get; }
-        public bool IsRelease { get; }
-
-        public string BrandTitle { get; }
-        public string BrandVersion { get; }
-
-        public BenchmarkDotNetInfo(Version assemblyVersion, string fullVersion)
-        {
-            AssemblyVersion = assemblyVersion;
-            FullVersion = fullVersion;
-
-            string versionPrefix = AssemblyVersion.Revision > 0
-                ? AssemblyVersion.ToString()
-                : AssemblyVersion.ToString(3);
-            if (!FullVersion.StartsWith(versionPrefix))
-                throw new ArgumentException($"Inconsistent versions: '{assemblyVersion}' and '{fullVersion}'");
-            string versionSuffix = FullVersion.Substring(versionPrefix.Length).TrimStart('-');
-
-            IsDevelop = versionSuffix.StartsWith("develop");
-            IsNightly = AssemblyVersion.Revision > 0;
-            IsRelease = versionSuffix.IsEmpty() && AssemblyVersion.Revision <= 0;
-
-            string brandVersionSuffix = IsDevelop
-                ? "-" + DateTime.Now.ToString("yyyyMMdd")
-                : "";
-            BrandVersion = FullVersion + brandVersionSuffix;
-            BrandTitle = "BenchmarkDotNet v" + BrandVersion;
-        }
+        public static string FullTitle => FullTitleLazy.Value;
 
         internal const string PublicKey =
             "00240000048000009400000006020000002400005253413100040000010001002970bbdfca4d12" +

src/BenchmarkDotNet/Toolchains/InProcess/Emit/Implementation/Emitters/RunnableEmitter.cs

@@ -12,7 +12,6 @@
 using BenchmarkDotNet.Helpers.Reflection.Emit;
 using BenchmarkDotNet.Jobs;
 using BenchmarkDotNet.Loggers;
-using BenchmarkDotNet.Properties;
 using BenchmarkDotNet.Running;
 using BenchmarkDotNet.Toolchains.Results;
 using JetBrains.Annotations;
@@ -79,13 +78,11 @@ public static Assembly EmitPartitionAssembly(
 
         private static bool ShouldSaveToDisk(IConfig config)
         {
-            if (!BenchmarkDotNetInfo.Instance.IsRelease)
-            {
-                // we never want to do that in our official NuGet.org package, it's a hack
-                return config.Options.IsSet(ConfigOptions.KeepBenchmarkFiles) && Portability.RuntimeInformation.IsFullFramework;
-            }
-
+#if PRERELEASE_DEVELOP || PRERELEASE_NIGHTLY // we never want to do that in our official NuGet.org package, it's a hack
+            return config.Options.IsSet(ConfigOptions.KeepBenchmarkFiles) && Portability.RuntimeInformation.IsFullFramework;
+#else
             return false;
+#endif
         }
 
         private static string GetRunnableTypeName(BenchmarkBuildInfo benchmark)