Updated runtime to filter to local runtimes for *nix/osx

OmniSharp · Mar 25, 2016 · be219b2 · be219b2
1 parent cd65e41
commit be219b2
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/build.cake b/build.cake
@@ -41,15 +41,17 @@ public class BuildPlan
 
 var buildPlan = DeserializeJsonFromFile<BuildPlan>($"{workingDirectory}/build.json");
 // Limit scope if things we build
-buildPlan.Rids = buildPlan.Rids.Where(rid => {
+buildPlan.Rids = buildPlan.Rids.Where(runtime => {
     if (IsRunningOnWindows())
     {
-        return rid.StartsWith("win");
+        return runtime.StartsWith("win");
     }
     else
     {
-        // Need to fix this for osx / linux
-        return !rid.StartsWith("win");
+        var localRuntime = GetLocalRuntimeID(dotnetcli);
+        var localRuntimeWithoutVersion = Regex.Replace(localRuntime, "(\\d|\\.)*-", "-");
+        var runtimeWithoutVersion = Regex.Replace(runtime, "(\\d|\\.)*-", "-");
+        return localRuntimeWithoutVersion.Equals(runtimeWithoutVersion);
     }
 }).ToArray();