From 73d9109760f87c7d747f097d134cc7b904dafcc7 Mon Sep 17 00:00:00 2001
From: Dustin Campbell <dustin@teamcampbell.org>
Date: Thu, 27 Apr 2017 11:02:57 -0700
Subject: [PATCH] Include version number in Linux archives

---
 scripts/archiving.cake | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/scripts/archiving.cake b/scripts/archiving.cake
index e62cd151c8..1e45454ed5 100644
--- a/scripts/archiving.cake
+++ b/scripts/archiving.cake
@@ -20,19 +20,14 @@ string GetBuildIdentifier(string runtime, string framework)
     }
     else
     {
-        // Remove version number. Note: because there are separate versions for Ubuntu 14 and 16,
-        // we treat Ubuntu as a special case.
-        if (runtime.StartsWith("ubuntu.14"))
+        // Remove version number for Windows and OSX.
+        if (runtime.StartsWith("win") || runtime.StartsWith("osx"))
         {
-            runtimeShort = "ubuntu14-x64";
-        }
-        else if (runtime.StartsWith("ubuntu.16"))
-        {
-            runtimeShort = "ubuntu16-x64";
+            runtimeShort = Regex.Replace(runtime, "(\\d|\\.)*-", "-");
         }
         else
         {
-            runtimeShort = Regex.Replace(runtime, "(\\d|\\.)*-", "-");
+            runtimeShort = runtime;
         }
     }