From: Michelle McDaniel <adiaaida@gmail.com>
Date: Wed, 4 Oct 2017 17:21:56 +0000 (-0700)
Subject: Fix IsAppContainerProcess for Windows 7
X-Git-Tag: submit/tizen/20210909.063632~11031^2~6437^2~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a02a7da1d806491016d33eaea1a5850633067d17;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

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
--- 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;
             }
         }