Merge pull request #266 from mellinoe/rid-moniker-mappings

mellinoe · web-flow · commit 6023e3f58532 · 2016-09-13T14:20:21.000-07:00
Add rid-moniker mappings for openSUSE 42.1 and Ubuntu 16.10
diff --git a/build_projects/shared-build-targets-utils/Utils/Monikers.cs b/build_projects/shared-build-targets-utils/Utils/Monikers.cs
@@ -19,7 +19,7 @@ public static string GetProductMoniker(BuildTargetContext c, string artifactPref
         {
             string rid = Environment.GetEnvironmentVariable("TARGETRID") ?? RuntimeEnvironment.GetRuntimeIdentifier();
 
-            if (rid == "ubuntu.16.04-x64" || rid == "fedora.23-x64" || rid == "opensuse.13.2-x64")
+            if (rid == "ubuntu.16.04-x64" || rid == "ubuntu.16.10-x64" || rid == "fedora.23-x64" || rid == "opensuse.13.2-x64" || rid == "opensuse.42.1-x64")
             {
                 return $"{artifactPrefix}-{rid}.{version}";
             }
@@ -37,10 +37,14 @@ public static string GetBadgeMoniker()
             {
                 case "ubuntu.16.04-x64":
                      return "Ubuntu_16_04_x64";
+                case "ubuntu.16.10-x64":
+                     return "Ubuntu_16_10_x64";
                 case "fedora.23-x64":
                      return "Fedora_23_x64";
                 case "opensuse.13.2-x64":
                      return "openSUSE_13_2_x64";
+                case "opensuse.42.1-x64":
+                     return "openSUSE_42_1_x64";
             }
 
             return $"{CurrentPlatform.Current}_{CurrentArchitecture.Current}";

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public static string GetProductMoniker(BuildTargetContext c, string artifactPref`
`19`	`19`	`{`
`20`	`20`	`string rid = Environment.GetEnvironmentVariable("TARGETRID") ?? RuntimeEnvironment.GetRuntimeIdentifier();`
`21`	`21`
`22`		`- if (rid == "ubuntu.16.04-x64" \|\| rid == "fedora.23-x64" \|\| rid == "opensuse.13.2-x64")`
	`22`	`+ if (rid == "ubuntu.16.04-x64" \|\| rid == "ubuntu.16.10-x64" \|\| rid == "fedora.23-x64" \|\| rid == "opensuse.13.2-x64" \|\| rid == "opensuse.42.1-x64")`
`23`	`23`	`{`
`24`	`24`	`return $"{artifactPrefix}-{rid}.{version}";`
`25`	`25`	`}`
`@@ -37,10 +37,14 @@ public static string GetBadgeMoniker()`
`37`	`37`	`{`
`38`	`38`	`case "ubuntu.16.04-x64":`
`39`	`39`	`return "Ubuntu_16_04_x64";`
	`40`	`+ case "ubuntu.16.10-x64":`
	`41`	`+ return "Ubuntu_16_10_x64";`
`40`	`42`	`case "fedora.23-x64":`
`41`	`43`	`return "Fedora_23_x64";`
`42`	`44`	`case "opensuse.13.2-x64":`
`43`	`45`	`return "openSUSE_13_2_x64";`
	`46`	`+ case "opensuse.42.1-x64":`
	`47`	`+ return "openSUSE_42_1_x64";`
`44`	`48`	`}`
`45`	`49`
`46`	`50`	`return $"{CurrentPlatform.Current}_{CurrentArchitecture.Current}";`