Fix IsAppContainerProcess for Windows 7

Commit migrated from https://github.com/dotnet/corefx/commit/d354aa6d83b327e0e4f84a258091fad37b7e0140

diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/src/misc/EnvironmentHelpers.cs b/src/libraries/System.Diagnostics.PerformanceCounter/src/misc/EnvironmentHelpers.cs
index 6984249..05e0832 100644 (file)
--- a/src/libraries/System.Diagnostics.PerformanceCounter/src/misc/EnvironmentHelpers.cs
+++ b/src/libraries/System.Diagnostics.PerformanceCounter/src/misc/EnvironmentHelpers.cs
@@ -18,13 +18,20 @@ namespace System
         {
             get
             {
-                if (!s_isAppContainerProcessInitalized)
-                {
-                    s_isAppContainerProcess = HasAppContainerToken();
-                    s_isAppContainerProcessInitalized = true;
+                if(!s_IsAppContainerProcessInitalized) {
+                   if(Environment.OSVersion.Platform != PlatformID.Win32NT) {
+                       s_IsAppContainerProcess = false;
+                   } else if(Environment.OSVersion.Version.Major < 6 || (Environment.OSVersion.Version.Major == 6 && Environment.OSVersion.Version.Minor <= 1)) {
+                       // Windows 7 or older.
+                       s_IsAppContainerProcess = false;
+                   } else {
+                       s_IsAppContainerProcess = HasAppContainerToken();
+                   }
+ 
+                    s_IsAppContainerProcessInitalized = true;
                 }
-
-                return s_isAppContainerProcess;
+ 
+                return s_IsAppContainerProcess;
             }
         }