Fix IsAppContainerProcess

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

diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/src/misc/EnvironmentHelpers.cs b/src/libraries/System.Diagnostics.PerformanceCounter/src/misc/EnvironmentHelpers.cs
index 05e0832..cb780f8 100644 (file)
--- a/src/libraries/System.Diagnostics.PerformanceCounter/src/misc/EnvironmentHelpers.cs
+++ b/src/libraries/System.Diagnostics.PerformanceCounter/src/misc/EnvironmentHelpers.cs
@@ -18,20 +18,25 @@ namespace System
         {
             get
             {
-                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)) {
+                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_isAppContainerProcess = false;
+                   }
+                   else
+                   {
+                       s_isAppContainerProcess = HasAppContainerToken();
                    }
  
-                    s_IsAppContainerProcessInitalized = true;
+                    s_isAppContainerProcessInitalized = true;
                 }
  
-                return s_IsAppContainerProcess;
+                return s_isAppContainerProcess;
             }
         }
 

diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/tests/PerformanceCounterTests.cs b/src/libraries/System.Diagnostics.PerformanceCounter/tests/PerformanceCounterTests.cs
index f1fc184..7bf2b53 100644 (file)
--- a/src/libraries/System.Diagnostics.PerformanceCounter/tests/PerformanceCounterTests.cs
+++ b/src/libraries/System.Diagnostics.PerformanceCounter/tests/PerformanceCounterTests.cs
@@ -9,7 +9,7 @@ using Xunit;
 
 namespace System.Diagnostics.Tests
 {
-    [SkipOnTargetFramework(TargetFrameworkMonikers.Uap)]
+    [SkipOnTargetFramework(TargetFrameworkMonikers.Uap)] // In appcontainer, cannot write to perf counters
     public static class PerformanceCounterTests
     {
         [ConditionalFact(typeof(AdminHelpers), nameof(AdminHelpers.IsProcessElevated))]