From 928c510c84e642729b46ce253f4853b57475055b Mon Sep 17 00:00:00 2001
From: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Thu, 11 May 2017 08:59:38 -0500
Subject: [PATCH] Clean up unused build code.

---
 build/package/Installer.MSI.targets           |  3 +-
 .../CurrentArchitecture.cs                    | 53 -------------------
 .../Enumerations/BuildArchitecture.cs         | 11 ----
 .../dotnet-cli-build/GenerateMsiVersion.cs    |  7 +--
 .../Utils/BuildVersion.cs                     | 12 -----
 .../Utils/Version.cs                          |  2 -
 6 files changed, 2 insertions(+), 86 deletions(-)
 delete mode 100644 build_projects/Microsoft.DotNet.Cli.Build.Framework/CurrentArchitecture.cs
 delete mode 100644 build_projects/Microsoft.DotNet.Cli.Build.Framework/Enumerations/BuildArchitecture.cs
 delete mode 100644 build_projects/shared-build-targets-utils/Utils/BuildVersion.cs

diff --git a/build/package/Installer.MSI.targets b/build/package/Installer.MSI.targets
index c11174f2d..7154f10d6 100644
--- a/build/package/Installer.MSI.targets
+++ b/build/package/Installer.MSI.targets
@@ -45,8 +45,7 @@
       <GenerateMsiVersion CommitCount="$(CommitCount)"
                           VersionMajor="$(VersionMajor)"
                           VersionMinor="$(VersionMinor)"
-                          VersionPatch="$(VersionPatch)"
-                          ReleaseSuffix="$(ReleaseSuffix)">
+                          VersionPatch="$(VersionPatch)">
         <Output TaskParameter="MsiVersion" PropertyName="MsiVersion" />
       </GenerateMsiVersion>
 
diff --git a/build_projects/Microsoft.DotNet.Cli.Build.Framework/CurrentArchitecture.cs b/build_projects/Microsoft.DotNet.Cli.Build.Framework/CurrentArchitecture.cs
deleted file mode 100644
index a6b90cc63..000000000
--- a/build_projects/Microsoft.DotNet.Cli.Build.Framework/CurrentArchitecture.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System;
-using Microsoft.DotNet.PlatformAbstractions;
-
-namespace Microsoft.DotNet.Cli.Build.Framework
-{
-    public static class CurrentArchitecture
-    {
-        public static BuildArchitecture Current
-        {
-            get
-            {
-                return DetermineCurrentArchitecture();
-            }
-        }
-
-        public static bool Isx86
-        {
-            get
-            {
-                var archName = RuntimeEnvironment.RuntimeArchitecture;
-                return string.Equals(archName, "x86", StringComparison.OrdinalIgnoreCase);
-            }
-        }
-
-        public static bool Isx64
-        {
-            get
-            {
-                var archName = RuntimeEnvironment.RuntimeArchitecture;
-                return string.Equals(archName, "x64", StringComparison.OrdinalIgnoreCase);
-            }
-        }
-
-        private static BuildArchitecture DetermineCurrentArchitecture()
-        {
-            if (Isx86)
-            {
-                return BuildArchitecture.x86;
-            }
-            else if (Isx64)
-            {
-                return BuildArchitecture.x64;
-            }
-            else
-            {
-                return default(BuildArchitecture);
-            }
-        }
-    }
-}
diff --git a/build_projects/Microsoft.DotNet.Cli.Build.Framework/Enumerations/BuildArchitecture.cs b/build_projects/Microsoft.DotNet.Cli.Build.Framework/Enumerations/BuildArchitecture.cs
deleted file mode 100644
index d5d50ee6f..000000000
--- a/build_projects/Microsoft.DotNet.Cli.Build.Framework/Enumerations/BuildArchitecture.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-namespace Microsoft.DotNet.Cli.Build.Framework
-{
-    public enum BuildArchitecture
-    {
-        x86 = 1,
-        x64 = 2
-    }
-}
diff --git a/build_projects/dotnet-cli-build/GenerateMsiVersion.cs b/build_projects/dotnet-cli-build/GenerateMsiVersion.cs
index 8a4043628..3c03a0a00 100644
--- a/build_projects/dotnet-cli-build/GenerateMsiVersion.cs
+++ b/build_projects/dotnet-cli-build/GenerateMsiVersion.cs
@@ -3,7 +3,6 @@
 
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
-using System.Runtime.InteropServices;
 
 namespace Microsoft.DotNet.Cli.Build
 {
@@ -21,20 +20,16 @@ namespace Microsoft.DotNet.Cli.Build
         [Required]
         public int VersionPatch { get; set; }
 
-        [Required]
-        public string ReleaseSuffix { get; set; }
-
         [Output]
         public string MsiVersion { get; set; }
 
         public override bool Execute()
         {
-            var buildVersion = new BuildVersion()
+            var buildVersion = new Version()
             {
                 Major = VersionMajor,
                 Minor = VersionMinor,
                 Patch = VersionPatch,
-                ReleaseSuffix = ReleaseSuffix,
                 CommitCount = CommitCount
             };
 
diff --git a/build_projects/shared-build-targets-utils/Utils/BuildVersion.cs b/build_projects/shared-build-targets-utils/Utils/BuildVersion.cs
deleted file mode 100644
index ba43dddcc..000000000
--- a/build_projects/shared-build-targets-utils/Utils/BuildVersion.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System.Collections.Generic;
-
-namespace Microsoft.DotNet.Cli.Build
-{
-    public class BuildVersion : Version
-    {
-        public string VersionSuffix => $"{ReleaseSuffix}-{CommitCountString}";
-    }
-}
diff --git a/build_projects/shared-build-targets-utils/Utils/Version.cs b/build_projects/shared-build-targets-utils/Utils/Version.cs
index cc2ec209b..b7d4e7536 100644
--- a/build_projects/shared-build-targets-utils/Utils/Version.cs
+++ b/build_projects/shared-build-targets-utils/Utils/Version.cs
@@ -9,8 +9,6 @@ namespace Microsoft.DotNet.Cli.Build
         public virtual int Minor { get; set; }
         public virtual int Patch { get; set; }
         public virtual int CommitCount { get; set; }
-        public virtual string CommitCountString => CommitCount.ToString("000000");
-        public virtual string ReleaseSuffix { get; set; }
 
         public string GenerateMsiVersion()
         {