Better handling of VersionId being missing.

dotnet · May 15, 2017 · b6aa0e6 · b6aa0e6
1 parent 7009256
commit b6aa0e6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs b/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs
@@ -128,14 +128,8 @@ private static DistroInfo LoadDistroInfo()
         // are backwards compatible.
         private static DistroInfo NormalizeDistroInfo(DistroInfo distroInfo)
         {
-            if (string.IsNullOrEmpty(distroInfo.VersionId))
-            {
-                // Some distribution does not have VERSION_ID defined.
-                // Since we need it, we workaround this by giving it the value "unavailable".
-                distroInfo.VersionId = "unavailable";
-            }
-
-            int minorVersionNumberSeparatorIndex = distroInfo.VersionId.IndexOf('.');
+            // Handle if VersionId is null by just setting the index to -1.
+            int minorVersionNumberSeparatorIndex = distroInfo.VersionId?.IndexOf('.') ?? -1;
 
             if (distroInfo.Id == "rhel" && minorVersionNumberSeparatorIndex != -1)
             {

diff --git a/src/managed/Microsoft.DotNet.PlatformAbstractions/RuntimeEnvironment.cs b/src/managed/Microsoft.DotNet.PlatformAbstractions/RuntimeEnvironment.cs
@@ -52,6 +52,11 @@ private static string GetRIDVersion()
                 case Platform.Windows:
                     return GetWindowsProductVersion();
                 case Platform.Linux:
+                    if (string.IsNullOrEmpty(OperatingSystemVersion))
+                    {
+                        return string.Empty;
+                    }
+
                     return $".{OperatingSystemVersion}";
                 case Platform.Darwin:
                     return $".{OperatingSystemVersion}";