Made uname() lazy

#1758
aspnet · May 6, 2015 · f37d04f · f37d04f
1 parent 94d1648
commit f37d04f
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/src/dnx.host/RuntimeEnvironment.cs b/src/dnx.host/RuntimeEnvironment.cs
@@ -3,14 +3,15 @@
 
 using System;
 using System.Reflection;
-using System.Runtime.Versioning;
 
 namespace Microsoft.Framework.Runtime
 {
     public class RuntimeEnvironment : IRuntimeEnvironment
     {
         private string _osVersion;
 
+        private string _osName;
+
         private string _runtimeVersion;
 
         public RuntimeEnvironment()
@@ -22,12 +23,21 @@ public RuntimeEnvironment()
             RuntimeType = Type.GetType("Mono.Runtime") == null ? "CLR" : "Mono";
             RuntimeArchitecture = Environment.Is64BitProcess ? "x64" : "x86";
 #endif
-
-            string uname = NativeMethods.Uname();
-            OperatingSystem = string.IsNullOrEmpty(uname) ? "Windows" : uname;
         }
 
-        public string OperatingSystem { get; private set; }
+        public string OperatingSystem
+        {
+            get
+            {
+                if (_osName == null)
+                {
+                    string uname = NativeMethods.Uname();
+                    _osName = string.IsNullOrEmpty(uname) ? "Windows" : uname;
+                }
+
+                return _osName;
+            }
+        }
 
         public string OperatingSystemVersion
         {